The Mer Wiki now uses your Mer user account and password (create account on https://bugs.merproject.org/)
Packaging/SDL
From Mer Wiki
(Difference between revisions)
(→Current approach) |
|||
| (4 intermediate revisions by one user not shown) | |||
| Line 1: | Line 1: | ||
| − | Packaging of SDL2 and related libraries. We use [[Nemo/Development#With_tar_git_service|tar_git]] for packaging. | + | Packaging of SDL2 and related libraries. We use [[Nemo/Development#With_tar_git_service|tar_git]] for packaging and <code>git-remote-hg</code> for integrating the upstream Mercurial repository into our Git packaging repository. |
| + | |||
| + | * Upstream website: http://libsdl.org/ | ||
| + | * Upstream VCS: https://hg.libsdl.org/ | ||
| + | |||
| + | == TODO == | ||
| + | |||
| + | * Cleanup / move away old branches (<code>rpm</code> and <code>master</code>) | ||
| + | * Remove master branch or make master branch point to default branch from hg | ||
== Current approach == | == Current approach == | ||
| Line 6: | Line 14: | ||
* Branch is <code>nemo</code> | * Branch is <code>nemo</code> | ||
* Token (<code>tar_git</code>) is also <code>nemo</code> | * Token (<code>tar_git</code>) is also <code>nemo</code> | ||
| + | * Old ChangeLog (from pre-April 2014 developments) entries are imported via <code>rpm/*.changes</code> | ||
* RPM package name, OBS package name in [https://build.merproject.org/project/packages?project=nemo:devel:mw nemo:devel:mw]: Git repository (upstream Hg repository): | * RPM package name, OBS package name in [https://build.merproject.org/project/packages?project=nemo:devel:mw nemo:devel:mw]: Git repository (upstream Hg repository): | ||
** '''SDL2''', '''libsdl2''': https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/) | ** '''SDL2''', '''libsdl2''': https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/) | ||
| Line 11: | Line 20: | ||
** '''SDL2_mixer''', '''libsdl2-mixer''': https://github.com/nemomobile-packages/libsdl-mixer (upstream: https://hg.libsdl.org/SDL_mixer/) | ** '''SDL2_mixer''', '''libsdl2-mixer''': https://github.com/nemomobile-packages/libsdl-mixer (upstream: https://hg.libsdl.org/SDL_mixer/) | ||
** '''SDL2_ttf''', '''libsdl2-ttf''': https://github.com/nemomobile-packages/libsdl-ttf (upstream: https://hg.libsdl.org/SDL_ttf/) | ** '''SDL2_ttf''', '''libsdl2-ttf''': https://github.com/nemomobile-packages/libsdl-ttf (upstream: https://hg.libsdl.org/SDL_ttf/) | ||
| + | ** '''SDL2_net''', '''libsdl2-net''': https://github.com/nemomobile-packages/libsdl-net (upstream: https://hg.libsdl.org/SDL_net/) | ||
| + | * Deprecated packages: | ||
| + | ** '''SDL2_sound''', from: http://hg.icculus.org/icculus/SDL_sound/ | ||
| + | * Needs rebasing: | ||
| + | ** '''SDL2_gfx''', from: http://cms.ferzkopp.net/index.php/software/13-sdl-gfx | ||
=== Packaging new upstream releases === | === Packaging new upstream releases === | ||
| Line 17: | Line 31: | ||
# <code>cd SDL</code> | # <code>cd SDL</code> | ||
# Add nemo remote: <code>git remote add nemo git@github.com:nemomobile-packages/libsdl.git</code> | # Add nemo remote: <code>git remote add nemo git@github.com:nemomobile-packages/libsdl.git</code> | ||
| + | # <code>git fetch nemo</code> | ||
# Checkout the "nemo" branch: <code>git checkout nemo</code> | # Checkout the "nemo" branch: <code>git checkout nemo</code> | ||
# Merge a new upstream release: <code>git merge release-2.x.y</code> (potentially drop local patches merged upstream) | # Merge a new upstream release: <code>git merge release-2.x.y</code> (potentially drop local patches merged upstream) | ||
Latest revision as of 11:57, 21 April 2014
Packaging of SDL2 and related libraries. We use tar_git for packaging and git-remote-hg for integrating the upstream Mercurial repository into our Git packaging repository.
- Upstream website: http://libsdl.org/
- Upstream VCS: https://hg.libsdl.org/
Contents |
[edit] TODO
- Cleanup / move away old branches (
rpmandmaster) - Remove master branch or make master branch point to default branch from hg
[edit] Current approach
- Using
git-remote-hg(see git-remote-hg wiki) - Branch is
nemo - Token (
tar_git) is alsonemo - Old ChangeLog (from pre-April 2014 developments) entries are imported via
rpm/*.changes - RPM package name, OBS package name in nemo:devel:mw: Git repository (upstream Hg repository):
- SDL2, libsdl2: https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/)
- SDL2_image, libsdl2-image: https://github.com/nemomobile-packages/libsdl-image (upstream: https://hg.libsdl.org/SDL_image/)
- SDL2_mixer, libsdl2-mixer: https://github.com/nemomobile-packages/libsdl-mixer (upstream: https://hg.libsdl.org/SDL_mixer/)
- SDL2_ttf, libsdl2-ttf: https://github.com/nemomobile-packages/libsdl-ttf (upstream: https://hg.libsdl.org/SDL_ttf/)
- SDL2_net, libsdl2-net: https://github.com/nemomobile-packages/libsdl-net (upstream: https://hg.libsdl.org/SDL_net/)
- Deprecated packages:
- SDL2_sound, from: http://hg.icculus.org/icculus/SDL_sound/
- Needs rebasing:
- SDL2_gfx, from: http://cms.ferzkopp.net/index.php/software/13-sdl-gfx
[edit] Packaging new upstream releases
- Clone upstream:
git clone hg::https://hg.libsdl.org/SDL/ -
cd SDL - Add nemo remote:
git remote add nemo git@github.com:nemomobile-packages/libsdl.git -
git fetch nemo - Checkout the "nemo" branch:
git checkout nemo - Merge a new upstream release:
git merge release-2.x.y(potentially drop local patches merged upstream) - Update version in
rpm/*.spec, reset release to1 - Run a test build:
mb2 build - Commit spec file changes, message:
[nemo] New upstream release 2.x.y - Push changes:
git push nemo nemo - Tag as
nemo/VERSION-RELEASE(e.g.nemo/2.0.0-1) - Push tag:
git push nemo nemo/2.0.0-1
[edit] Packaging local changes / patches
- Clone nemo:
git clone git@github.com:nemomobile-packages/libsdl.git -
cd libsdl - Checkout the "nemo" branch:
git checkout nemo - Make changes
- Run a test build:
mb2 build - Increment release number in
rpm/*.spec - Commit with message
[nemo] DESCRIPTION OF CHANGES - Push changes:
git push nemo nemo - Tag as
nemo/VERSION-RELEASE(e.g.nemo/2.0.0-2) - Push tag:
git push nemo nemo/2.0.0-2
[edit] Previously
- Using hg-fast-export for importing from hg to git
- Branch is
rpm - Token is
nemo
