[helix-maintainers] Ubuntu helix-player 1.0.9-0ubuntu2
Ubuntu Merge-o-Matic
mom at ubuntu.com
Tue Nov 20 15:31:07 UTC 2007
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 20 Nov 2007 23:47:39 +1100
Source: helix-player
Binary: mozilla-helix-player helix-player
Architecture: source
Version: 1.0.9-0ubuntu2
Distribution: hardy
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Steve Kowalik <stevenk at ubuntu.com>
Description:
helix-player - Helix audio and video player
mozilla-helix-player - Helix audio and video player (browser plugin)
Changes:
helix-player (1.0.9-0ubuntu2) hardy; urgency=low
.
* Stop using Helix's Ribosome build system - it makes baby Jesus and me
cry blood. Instead, generate Makefile's from each Umakefil, and then
call make directly.
- Define PROFILE_ID to be helix-client-all-defines-free.
* Add a SYSTEM_ID of linux-2.6-glibc23-i686 for lpia.
* Add 11-makefile-fixes to not try and call targets in
shadowsdk/oggvorbissdk, along with a bunch of installer targets.
* Add 12-umakefil-fixes to fix up two Umakefil's so that Makefiles can
be generated.
* Add 13-installer-fixes to make sure the "installer" copies files from the
right places.
Files:
e99275f156e32fdd2f68a6a6638680dc 817 graphics optional helix-player_1.0.9-0ubuntu2.dsc
5fe7a23a497e260db83b4b5af07481ca 17756 graphics optional helix-player_1.0.9-0ubuntu2.diff.gz
Original-Maintainer: Daniel Baumann <daniel at debian.org>
-------------- next part --------------
diff -pruN 1.0.9-0ubuntu1/debian/changelog 1.0.9-0ubuntu2/debian/changelog
--- 1.0.9-0ubuntu1/debian/changelog 2007-11-20 15:12:23.000000000 +0000
+++ 1.0.9-0ubuntu2/debian/changelog 2007-11-20 15:12:21.000000000 +0000
@@ -1,3 +1,19 @@
+helix-player (1.0.9-0ubuntu2) hardy; urgency=low
+
+ * Stop using Helix's Ribosome build system - it makes baby Jesus and me
+ cry blood. Instead, generate Makefile's from each Umakefil, and then
+ call make directly.
+ - Define PROFILE_ID to be helix-client-all-defines-free.
+ * Add a SYSTEM_ID of linux-2.6-glibc23-i686 for lpia.
+ * Add 11-makefile-fixes to not try and call targets in
+ shadowsdk/oggvorbissdk, along with a bunch of installer targets.
+ * Add 12-umakefil-fixes to fix up two Umakefil's so that Makefiles can
+ be generated.
+ * Add 13-installer-fixes to make sure the "installer" copies files from the
+ right places.
+
+ -- Steve Kowalik <stevenk at ubuntu.com> Tue, 20 Nov 2007 23:47:39 +1100
+
helix-player (1.0.9-0ubuntu1) hardy; urgency=low
* New upstream release.
diff -pruN 1.0.9-0ubuntu1/debian/patches/00list 1.0.9-0ubuntu2/debian/patches/00list
--- 1.0.9-0ubuntu1/debian/patches/00list 2007-11-20 15:12:23.000000000 +0000
+++ 1.0.9-0ubuntu2/debian/patches/00list 2007-11-20 15:12:21.000000000 +0000
@@ -1,4 +1,3 @@
-02-buildrc
03-branding
04-locale
05-hxplay
@@ -7,3 +6,6 @@
08-typedef-jpg
09-disable-asm-math64
10-missing-includes
+11-makefile-fixes
+12-umakefil-fixes
+13-installer-fixes
diff -pruN 1.0.9-0ubuntu1/debian/patches/11-makefile-fixes.dpatch 1.0.9-0ubuntu2/debian/patches/11-makefile-fixes.dpatch
--- 1.0.9-0ubuntu1/debian/patches/11-makefile-fixes.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ 1.0.9-0ubuntu2/debian/patches/11-makefile-fixes.dpatch 2007-11-20 15:12:21.000000000 +0000
@@ -0,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-makefile-fixes.dpatch by Steve Kowalik <stevenk at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't build oggvorbissdk, along with a bunch of installer targets.
+
+ at DPATCH@
+diff -urNad helix-player-1.0.9~/Makefile helix-player-1.0.9/Makefile
+--- helix-player-1.0.9~/Makefile 2007-08-19 01:38:04.000000000 +1000
++++ helix-player-1.0.9/Makefile 2007-11-20 17:04:53.000000000 +1100
+@@ -118,7 +118,6 @@
+ cd datatype/text/realtext/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd datatype/text/realtext/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd datatype/text/realtext/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+- cd shadowsdk/oggvorbissdk && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd datatype/ogg/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd datatype/vorbis/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd datatype/theora/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+@@ -142,9 +141,6 @@
+ cd installer/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd player/installer/postinst && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+ cd player/installer/archive && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+- cd player/installer/stage1 && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+- cd player/installer/app && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+- cd player/installer/rpm && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile
+
+ rel/obj:
+ - at test -d rel || mkdir rel
+@@ -237,7 +233,6 @@
+ cd datatype/text/realtext/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd datatype/text/realtext/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd datatype/text/realtext/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+- cd shadowsdk/oggvorbissdk && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd datatype/ogg/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd datatype/vorbis/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd datatype/theora/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+@@ -261,9 +256,6 @@
+ cd installer/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd player/installer/postinst && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+ cd player/installer/archive && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+- cd player/installer/stage1 && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+- cd player/installer/app && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+- cd player/installer/rpm && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile all_objects
+
+ depend:
+ cd common/runtime && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+@@ -352,7 +344,6 @@
+ cd datatype/text/realtext/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd datatype/text/realtext/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd datatype/text/realtext/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+- cd shadowsdk/oggvorbissdk && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd datatype/ogg/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd datatype/vorbis/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd datatype/theora/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+@@ -376,9 +367,6 @@
+ cd installer/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd player/installer/postinst && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+ cd player/installer/archive && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+- cd player/installer/stage1 && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+- cd player/installer/app && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+- cd player/installer/rpm && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile depend
+
+ copy:
+ cd common/runtime && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+@@ -467,7 +455,6 @@
+ cd datatype/text/realtext/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd datatype/text/realtext/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd datatype/text/realtext/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+- cd shadowsdk/oggvorbissdk && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd datatype/ogg/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd datatype/vorbis/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd datatype/theora/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+@@ -491,9 +478,6 @@
+ cd installer/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd player/installer/postinst && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+ cd player/installer/archive && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+- cd player/installer/stage1 && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+- cd player/installer/app && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+- cd player/installer/rpm && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile copy
+
+ clean:
+ -cd common/runtime && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+@@ -582,7 +566,6 @@
+ -cd datatype/text/realtext/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd datatype/text/realtext/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd datatype/text/realtext/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+- -cd shadowsdk/oggvorbissdk && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd datatype/ogg/fileformat && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd datatype/vorbis/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd datatype/theora/renderer && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+@@ -606,7 +589,4 @@
+ -cd installer/common && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd player/installer/postinst && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+ -cd player/installer/archive && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+- -cd player/installer/stage1 && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+- -cd player/installer/app && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+- -cd player/installer/rpm && $(MAKE) $(SUBMAKEFLAGS) SUBMAKEFLAGS="$(SUBMAKEFLAGS)" -f Makefile clean
+
diff -pruN 1.0.9-0ubuntu1/debian/patches/12-umakefil-fixes.dpatch 1.0.9-0ubuntu2/debian/patches/12-umakefil-fixes.dpatch
--- 1.0.9-0ubuntu1/debian/patches/12-umakefil-fixes.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ 1.0.9-0ubuntu2/debian/patches/12-umakefil-fixes.dpatch 2007-11-20 15:12:21.000000000 +0000
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-umakefil-fixes.dpatch by Steve Kowalik <stevenk at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Also fix up two Umakefil's so that Makefiles can get generated.
+
+ at DPATCH@
+diff -urNad helix-player-1.0.9~/client/resource/Umakefil helix-player-1.0.9/client/resource/Umakefil
+--- helix-player-1.0.9~/client/resource/Umakefil 2004-07-20 07:03:59.000000000 +1000
++++ helix-player-1.0.9/client/resource/Umakefil 2007-11-15 21:39:09.000000000 +1100
+@@ -57,9 +57,9 @@
+ project.AddIncludes("../include",
+ "../common/system/pub")
+
+-if (platform.type == 'macPPC'):
+- DLLWithResourceTarget('coreres', 'coreres60', 'coreres.rc',['./res','./platform/win','./pub'])
+-else:
+- DLLTarget('coreres')
++#if (platform.type == 'macPPC'):
++# DLLWithResourceTarget('coreres', 'coreres60', 'coreres.rc',['./res','./platform/win','./pub'])
++#else:
++# DLLTarget('coreres')
+
+ DependTarget()
+diff -urNad helix-player-1.0.9~/datatype/ogg/fileformat/Umakefil helix-player-1.0.9/datatype/ogg/fileformat/Umakefil
+--- helix-player-1.0.9~/datatype/ogg/fileformat/Umakefil 2004-11-25 05:02:52.000000000 +1100
++++ helix-player-1.0.9/datatype/ogg/fileformat/Umakefil 2007-11-15 21:34:26.000000000 +1100
+@@ -51,6 +51,7 @@
+
+ UmakefileVersion(2,1)
+
++SetSDKPath("oggvorbissdk", "/usr")
+ project.AddIncludes(os.path.join(GetSDKPath("oggvorbissdk"), "include"),
+ os.path.join(GetSDKPath("oggvorbissdk"),
+ "libvorbis-1.0.1", "lib"))
diff -pruN 1.0.9-0ubuntu1/debian/patches/13-installer-fixes.dpatch 1.0.9-0ubuntu2/debian/patches/13-installer-fixes.dpatch
--- 1.0.9-0ubuntu1/debian/patches/13-installer-fixes.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ 1.0.9-0ubuntu2/debian/patches/13-installer-fixes.dpatch 2007-11-20 15:12:21.000000000 +0000
@@ -0,0 +1,259 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-installer-fixes.dpatch by Steve Kowalik <stevenk at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add /rel to all paths with compiled files. Sigh.
+
+ at DPATCH@
+diff -urNad helix-player-1.0.9~/player/installer/archive/make_tempdir helix-player-1.0.9/player/installer/archive/make_tempdir
+--- helix-player-1.0.9~/player/installer/archive/make_tempdir 2005-02-02 11:59:08.000000000 +1100
++++ helix-player-1.0.9/player/installer/archive/make_tempdir 2007-11-20 17:16:04.000000000 +1100
+@@ -92,90 +92,90 @@
+ ("player/app/gtk", "realplay", "realplay"))
+ else:
+ inst.CopyModuleExes(
+- ("player/app/gtk", "hxplay.bin", "hxplay.bin"),
++ ("player/app/gtk/rel", "hxplay.bin", "hxplay.bin"),
+ ("player/app/gtk", "hxplay", "hxplay"))
+
+
+ # widget lib
+-inst.CopyModuleDlls(("player/common/gtk", "libgtkhx", "lib/libgtkhx"))
++inst.CopyModuleDlls(("player/common/gtk/rel", "libgtkhx", "lib/libgtkhx"))
+
+ # mozilla plugin
+ inst.CopyModuleDlls(
+- ("filesystem/memory", "memfsys", "plugins/memfsys"),
+- ("player/app/plugin", "nphelix", "mozilla/nphelix"))
++ ("filesystem/memory/rel", "memfsys", "plugins/memfsys"),
++ ("player/app/plugin/rel", "nphelix", "mozilla/nphelix"))
+ inst.CopyFiles(
+ ("../../../player/app/plugin/nphelix.xpt", "mozilla/nphelix.xpt"))
+
+ # client core
+ inst.CopyModuleDlls(
+- ("client/core", "clntcore", "common/clntcore"),
+- ("client/xres", "clntxres", "common/clntxres"))
++ ("client/core/rel", "clntcore", "common/clntcore"),
++ ("client/xres/rel", "clntxres", "common/clntxres"))
+
+ # important plugins
+ inst.CopyModuleDlls(
+- ("video/site", "vidsite", "plugins/vidsite"),
+- ("common/lang/xml", "hxxml", "plugins/hxxml"),
+- ("common/auth/authmgr", "authmgr", "plugins/authmgr"),
+- ("client/auth/basicauth", "clbascauth", "plugins/clbascauth"))
++ ("video/site/rel", "vidsite", "plugins/vidsite"),
++ ("common/lang/xml/rel", "hxxml", "plugins/hxxml"),
++ ("common/auth/authmgr/rel", "authmgr", "plugins/authmgr"),
++ ("client/auth/basicauth/rel", "clbascauth", "plugins/clbascauth"))
+
+ # rn5auth (for authenticating to RealServer)
+-if os.path.exists(os.path.join(project.src_root_path,
+- "common/auth/rn5auth",
+- project.output_dir,
+- "rn5auth.so")):
+- inst.CopyModuleDlls(("common/auth/rn5auth", "rn5auth", "plugins/rn5auth"))
++#if os.path.exists(os.path.join(project.src_root_path,
++# "common/auth/rn5auth",
++# project.output_dir,
++# "rn5auth.so")):
++inst.CopyModuleDlls(("common/auth/rn5auth/rel", "rn5auth", "plugins/rn5auth"))
+
+
+ # RAM metafile
+ inst.CopyModuleDlls(
+- ("datatype/ram/fileformat", "ramfformat", "plugins/ramfformat"),
+- ("datatype/ram/renderer", "ramrender", "plugins/ramrender"))
++ ("datatype/ram/fileformat/rel", "ramfformat", "plugins/ramfformat"),
++ ("datatype/ram/renderer/rel", "ramrender", "plugins/ramrender"))
+
+ # SMIL support
+ inst.CopyModuleDlls(
+- ("datatype/smil/fileformat", "smlfformat", "plugins/smlfformat"),
+- ("datatype/smil/renderer", "smlrender", "plugins/smlrender"),
+- ("datatype/image/gif/fileformat", "giffformat", "plugins/giffformat"),
+- ("datatype/image/gif/renderer", "gifrender", "plugins/gifrender"),
+- ("datatype/image/jpg/fileformat", "jpgfformat", "plugins/jpgfformat"),
+- ("datatype/image/jpg/renderer", "jpgrender", "plugins/jpgrender"),
+- ("datatype/image/png/fileformat", "pngfformat", "plugins/pngfformat"),
+- ("datatype/image/png/renderer", "pngrender", "plugins/pngrender"),
+- ("datatype/image/wbmp/fileformat", "wbmpfformat", "plugins/wbmpfformat"),
+- ("datatype/image/wbmp/renderer", "wbmprend", "plugins/wbmprend"))
++ ("datatype/smil/fileformat/rel", "smlfformat", "plugins/smlfformat"),
++ ("datatype/smil/renderer/rel", "smlrender", "plugins/smlrender"),
++ ("datatype/image/gif/fileformat/rel", "giffformat", "plugins/giffformat"),
++ ("datatype/image/gif/renderer/rel", "gifrender", "plugins/gifrender"),
++ ("datatype/image/jpg/fileformat/rel", "jpgfformat", "plugins/jpgfformat"),
++ ("datatype/image/jpg/renderer/rel", "jpgrender", "plugins/jpgrender"),
++ ("datatype/image/png/fileformat/rel", "pngfformat", "plugins/pngfformat"),
++ ("datatype/image/png/renderer/rel", "pngrender", "plugins/pngrender"),
++ ("datatype/image/wbmp/fileformat/rel", "wbmpfformat", "plugins/wbmpfformat"),
++ ("datatype/image/wbmp/renderer/rel", "wbmprend", "plugins/wbmprend"))
+
+ # RealPix
+ inst.CopyModuleDlls(
+- ("datatype/image/realpix/fileformat", "rpfformat", "plugins/rpfformat"),
+- ("datatype/image/realpix/renderer", "rprender", "plugins/rprender"),
+- ("datatype/image/realpix/codec/gif", "rpgifplin", "plugins/rpgifplin"),
+- ("datatype/image/realpix/codec/jpg", "rpjpgplin", "plugins/rpjpgplin"),
+- ("datatype/image/realpix/codec/png", "rppngplin", "plugins/rppngplin"))
++ ("datatype/image/realpix/fileformat/rel", "rpfformat", "plugins/rpfformat"),
++ ("datatype/image/realpix/renderer/rel", "rprender", "plugins/rprender"),
++ ("datatype/image/realpix/codec/gif/rel", "rpgifplin", "plugins/rpgifplin"),
++ ("datatype/image/realpix/codec/jpg/rel", "rpjpgplin", "plugins/rpjpgplin"),
++ ("datatype/image/realpix/codec/png/rel", "rppngplin", "plugins/rppngplin"))
+
+ # RealText
+ inst.CopyModuleDlls(
+- ("datatype/text/realtext/fileformat", "rtfformat", "plugins/rtfformat"),
+- ("datatype/text/realtext/renderer", "rtrender", "plugins/rtrender"))
++ ("datatype/text/realtext/fileformat/rel", "rtfformat", "plugins/rtfformat"),
++ ("datatype/text/realtext/renderer/rel", "rtrender", "plugins/rtrender"))
+
+ # local playback
+-if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL"):
+- inst.CopyModuleDlls(
+- ("filesystem/local", "smplfsys", "plugins/smplfsys"))
++#if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL"):
++inst.CopyModuleDlls(
++ ("filesystem/local/rel", "smplfsys", "plugins/smplfsys"))
+
+ # network playback
+-if project.IsDefined("HELIX_FEATURE_PLAYBACK_NET"):
+- inst.CopyModuleDlls(
+- ("filesystem/http", "httpfsys", "plugins/httpfsys"),
+- ("protocol/sdp", "hxsdp", "plugins/hxsdp"))
++#if project.IsDefined("HELIX_FEATURE_PLAYBACK_NET"):
++inst.CopyModuleDlls(
++ ("filesystem/http/rel", "httpfsys", "plugins/httpfsys"),
++ ("protocol/sdp/rel", "hxsdp", "plugins/hxsdp"))
+
+ # multicast support
+ inst.CopyModuleDlls(
+- ("datatype/sdp/plugin", "sdpplin", "plugins/sdpplin"))
++ ("datatype/sdp/plugin/rel", "sdpplin", "plugins/sdpplin"))
+
+ # color converters (XXXNH: do we need both?)
+ inst.CopyModuleDlls(
+- ("video/colconverter", "colorcvt", "codecs/colorcvt"),
+- ("video/colconverter", "cvt1", "codecs/cvt1"))
++ ("video/colconverter/rel", "colorcvt", "codecs/colorcvt"),
++ ("video/colconverter/rel", "cvt1", "codecs/cvt1"))
+
+ # view source
+ if project.IsDefined("HELIX_FEATURE_VIEWSOURCE"):
+@@ -195,12 +195,12 @@
+ inst.CopyModuleDlls(("datatype/amr/fileformat", "amrff", "plugins/amrff"))
+
+ # h.263 support
+-if project.IsDefined("HELIX_FEATURE_VIDEO_H263"):
+- inst.CopyModuleDlls(
+- ("datatype/h263/renderer", "h263render", "plugins/h263render"))
+- if project.IsDefined("HELIX_FEATURE_VIDEO_REAL"):
+- inst.CopyModuleDlls(
+- ("datatype/rm/video/codec/rv89combo", "rv40", "codecs/rv40"))
++#if project.IsDefined("HELIX_FEATURE_VIDEO_H263"):
++inst.CopyModuleDlls(
++ ("datatype/h263/renderer/rel", "h263render", "plugins/h263render"))
++# if project.IsDefined("HELIX_FEATURE_VIDEO_REAL"):
++# inst.CopyModuleDlls(
++# ("datatype/rm/video/codec/rv89combo", "rv40", "codecs/rv40"))
+
+ # MPEG4 support (currently audio only)
+ if project.IsDefined("HELIX_FEATURE_VIDEO_MPEG4"):
+@@ -272,30 +272,30 @@
+
+ # Vorbis support
+ need_ogg = 0
+-if project.IsDefined("HELIX_FEATURE_AUDIO_VORBIS"):
+- need_ogg = 1
+- inst.CopyModuleDlls(
+- ("datatype/vorbis/renderer", "vorbisrend", "plugins/vorbisrend"))
++#if project.IsDefined("HELIX_FEATURE_AUDIO_VORBIS"):
++need_ogg = 1
++inst.CopyModuleDlls(
++ ("datatype/vorbis/renderer/rel", "vorbisrend", "plugins/vorbisrend"))
+
+ # Theora support
+-if project.IsDefined("HELIX_FEATURE_VIDEO_THEORA"):
++#if project.IsDefined("HELIX_FEATURE_VIDEO_THEORA"):
+ # we're having build issues with theora on solaris, so skip it if
+ # it isn't there
+- if ("sunos5" in sysinfo.family_list and
++if ("sunos5" in sysinfo.family_list and
+ not os.path.exists(os.path.join(project.src_root_path,
+ "datatype/theora/renderer",
+ project.output_dir,
+ "theorarend.so"))):
+ umake_lib.warning("skipping inclusion of broken theora renderer")
+- else:
++else:
+ need_ogg = 1
+ inst.CopyModuleDlls(
+- ("datatype/theora/renderer", "theorarend", "plugins/theorarend"))
++ ("datatype/theora/renderer/rel", "theorarend", "plugins/theorarend"))
+
+ # Ogg support
+ if need_ogg:
+ inst.CopyModuleDlls(
+- ("datatype/ogg/fileformat", "oggfformat", "plugins/oggfformat"))
++ ("datatype/ogg/fileformat/rel", "oggfformat", "plugins/oggfformat"))
+
+ # Flash support
+ if (project.IsDefined("HELIX_FEATURE_FLASH") and
+@@ -305,17 +305,17 @@
+ ("datatype/flash/fileformat", "swfformat", "plugins/swfformat"))
+
+ # Audplin support
+-if project.IsDefined("HELIX_FEATURE_AUDIO_WAVE") or project.IsDefined("HELIX_FEATURE_AUDIO_AU") or project.IsDefined("HELIX_FEATURE_AUDIO_AIFF"):
+- inst.CopyModuleDlls(
+- ("datatype/group/audio", "audplin", "plugins/audplin"))
++#if project.IsDefined("HELIX_FEATURE_AUDIO_WAVE") or project.IsDefined("HELIX_FEATURE_AUDIO_AU") or project.IsDefined("HELIX_FEATURE_AUDIO_AIFF"):
++inst.CopyModuleDlls(
++ ("datatype/group/audio/rel", "audplin", "plugins/audplin"))
+
+-if project.IsDefined("HELIX_FEATURE_AUDIO_AU"):
+- inst.CopyModuleDlls(
+- ("datatype/au/fileformat", "aufformat", "plugins/aufformat"))
++#if project.IsDefined("HELIX_FEATURE_AUDIO_AU"):
++inst.CopyModuleDlls(
++ ("datatype/au/fileformat/rel", "aufformat", "plugins/aufformat"))
+
+-if project.IsDefined("HELIX_FEATURE_AUDIO_WAVE"):
+- inst.CopyModuleDlls(
+- ("datatype/wav/renderer/pcm", "pcmrend", "plugins/pcmrend"))
++#if project.IsDefined("HELIX_FEATURE_AUDIO_WAVE"):
++inst.CopyModuleDlls(
++ ("datatype/wav/renderer/pcm/rel", "pcmrend", "plugins/pcmrend"))
+
+ # mo files (gettext)
+ inst.MakeDirs("share/locale")
+@@ -338,19 +338,19 @@
+ if os.path.isfile(src_path):
+ inst.CopyFiles((src_path, dest_path))
+
+- if project.IsDefined('HELIX_FEATURE_REAL_BRANDING'):
+- src_path = os.path.join("../../../player/app/gtk/locale", language, "README.realplay")
+- else:
+- src_path = os.path.join("../../../player/app/gtk/locale", language, "README.hxplay")
++# if project.IsDefined('HELIX_FEATURE_REAL_BRANDING'):
++# src_path = os.path.join("../../../player/app/gtk/locale", language, "README.realplay")
++# else:
++ src_path = os.path.join("../../../player/app/gtk/locale", language, "README.hxplay")
+ dest_path = os.path.join(locale_path, "README")
+ if os.path.isfile(src_path):
+ inst.CopyFiles((src_path, dest_path))
+
+ # License (for RealPlayer)
+- if project.IsDefined("HELIX_FEATURE_RDT"):
+- src_path = os.path.join("../../../player/app/doc/real/locale", language, "LICENSE")
+- else:
+- src_path = os.path.join("../../../player/app/doc/helix/locale", language, "LICENSE")
++# if project.IsDefined("HELIX_FEATURE_RDT"):
++# src_path = os.path.join("../../../player/app/doc/real/locale", language, "LICENSE")
++# else:
++ src_path = os.path.join("../../../player/app/doc/helix/locale", language, "LICENSE")
+ dest_path = os.path.join(locale_path, "LICENSE")
+ if os.path.isfile(src_path):
+ inst.CopyFiles((src_path, dest_path))
diff -pruN 1.0.9-0ubuntu1/debian/rules 1.0.9-0ubuntu2/debian/rules
--- 1.0.9-0ubuntu1/debian/rules 2007-11-20 15:12:23.000000000 +0000
+++ 1.0.9-0ubuntu2/debian/rules 2007-11-20 15:12:21.000000000 +0000
@@ -27,6 +27,9 @@ else
ifeq (i386,$(ARCH))
SYSTEM_ID=linux-2.6-glibc23-i386
else
+ifeq (lpia,$(ARCH))
+ SYSTEM_ID=linux-2.6-glibc23-i686
+else
ifeq (ia64,$(ARCH))
SYSTEM_ID=linux-2.4-libc6-ia64
else
@@ -46,19 +49,34 @@ endif
endif
endif
endif
+endif
-BUILD_ROOT=$(CURDIR)/build
-BUILDRC=$(CURDIR)/buildrc
-
-export SYSTEM_ID BUILD_ROOT BUILDRC CFLAGS
+BUILD_ROOT:=$(CURDIR)/build
+PROFILE_ID=helix-client-all-defines-free
+MAKE_DIRS:=$(shell find $(CURDIR) -iname 'Umakefil' -printf "%h\n")
+
+export SYSTEM_ID BUILD_ROOT BUILDRC CFLAGS PROFILE_ID
+
+$(MAKE_DIRS):
+ @cd $@; \
+ if [ ! -f Makefile ]; then \
+ python $(BUILD_ROOT)/bin/umake.py -trelease; \
+ fi; \
+ if [ ! -f Makefile ]; then \
+ echo "Failure running umake in $$(pwd)"; \
+ exit 1; \
+ fi
+
+build.reg:
+ touch $@
build: build-stamp
-build-stamp: patch
+build-stamp: patch build.reg $(MAKE_DIRS)
dh_testdir
# Building package
- touch $(CURDIR)/buildrc
- python build/bin/build.py -v -k -m hxplay_gtk_release -P helix-client-all-defines-free -trelease player_installer_archive
+ $(MAKE) depend
+ CFLAGS="$(CFLAGS)" $(MAKE)
touch build-stamp
clean: unpatch
@@ -67,20 +85,21 @@ clean: unpatch
rm -f build-stamp
# Cleaning package
+ find $(CURIDR) -mindepth 2 -name 'Makefile' -exec $(RM) {} \+
rm -rf player/installer/archive/temp
- rm -f $(CURDIR)/buildrc
+ $(RM) $(CURDIR)/build.reg
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Installing package
- install -d -m 755 debian/helix-player/usr/lib/helix
- cp -R player/installer/archive/temp debian/helix-player/usr/lib/helix/player
+ install -d -m 755 debian/helix-player/usr/lib/helix/player
+ cp -R player/installer/archive/temp/* debian/helix-player/usr/lib/helix/player
sh debian/postbuild.sh
# Installing manpages
@@ -114,9 +133,9 @@ install: build
install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
done
-binary-indep: build install
+binary-indep: build-stamp install
-binary-arch: build install
+binary-arch: build-stamp install
dh_testdir
dh_testroot
dh_installchangelogs
@@ -136,4 +155,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install $(MAKE_DIRS)
More information about the helix-maintainers
mailing list