[gentoo-commits] gentoo commit in src/patchsets/gpac/0.4.5: 210_all_system_libogg.patch 220_all_respect_ldflags.patch series

[Samuli Suominen (ssuominen)]

ssuominen    10/04/29 18:18:12

  Modified:             series
  Added:                210_all_system_libogg.patch
                        220_all_respect_ldflags.patch
  Log:
  Upload patchset 4

Revision  Changes    Path
1.3                  src/patchsets/gpac/0.4.5/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?r1=1.2&r2=1.3

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gpac/0.4.5/series,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- series	29 Apr 2010 11:24:21 -0000	1.2
+++ series	29 Apr 2010 18:18:11 -0000	1.3
@@ -10,3 +10,5 @@
 180_all_bof.patch
 190_all_glx-define-prototype.patch
 200_all_libpng14.patch
+210_all_system_libogg.patch
+220_all_respect_ldflags.patch



1.1                  src/patchsets/gpac/0.4.5/210_all_system_libogg.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/210_all_system_libogg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/210_all_system_libogg.patch?rev=1.1&content-type=text/plain

Index: 210_all_system_libogg.patch
===================================================================
http://bugs.gentoo.org/258331

--- src/Makefile
+++ src/Makefile
@@ -36,7 +36,7 @@
 LIBGPAC_MCRYPT=mcrypt/cbc.o mcrypt/cfb.o mcrypt/ctr.o mcrypt/des.o mcrypt/ecb.o mcrypt/g_crypt.o mcrypt/ncfb.o mcrypt/nofb.o mcrypt/ofb.o mcrypt/rijndael-128.o mcrypt/rijndael-192.o mcrypt/rijndael-256.o mcrypt/stream.o mcrypt/tripledes.o mcrypt/sha1.o 
 
 ## libgpac objects gathering: src/media tools
-LIBGPAC_MEDIATOOLS=media_tools/av_parsers.o media_tools/avilib.o media_tools/gpac_ogg.o media_tools/img.o media_tools/ismacryp.o media_tools/isom_hinter.o media_tools/isom_tools.o media_tools/media_export.o media_tools/media_import.o media_tools/mpeg2_ps.o media_tools/text_import.o media_tools/saf.o media_tools/mpegts.o media_tools/vobsub.o
+LIBGPAC_MEDIATOOLS=media_tools/av_parsers.o media_tools/avilib.o media_tools/img.o media_tools/ismacryp.o media_tools/isom_hinter.o media_tools/isom_tools.o media_tools/media_export.o media_tools/media_import.o media_tools/mpeg2_ps.o media_tools/text_import.o media_tools/saf.o media_tools/mpegts.o media_tools/vobsub.o
 
 ## libgpac objects gathering: src/scene_manager
 LIBGPAC_SCENEMANAGER=scene_manager/loader_bt.o scene_manager/loader_isom.o scene_manager/loader_qt.o scene_manager/loader_xmt.o scene_manager/scene_dump.o scene_manager/scene_manager.o scene_manager/scene_stats.o scene_manager/swf_parse.o scene_manager/swf_bifs.o scene_manager/text_to_bifs.o scene_manager/encode_cbk.o scene_manager/encode_isom.o scene_manager/loader_svg.o
@@ -105,6 +105,14 @@
 endif
 endif
 
+ifeq ($(CONFIG_OGG), no)
+else
+ifeq ($(CONFIG_OGG), local)
+LIBGPAC_MEDIATOOLS+= media_tools/gpac_ogg.o
+else
+LINKLIBS+= -logg
+endif
+endif
 
 ifneq ($(prefix), /usr/local)
 EXTRALIBS+=-L$(prefix)/lib



1.1                  src/patchsets/gpac/0.4.5/220_all_respect_ldflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/220_all_respect_ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/220_all_respect_ldflags.patch?rev=1.1&content-type=text/plain

Index: 220_all_respect_ldflags.patch
===================================================================
http://bugs.gentoo.org/258331
http://bugs.gentoo.org/310257

--- modules/alsa/Makefile
+++ modules/alsa/Makefile
@@ -31,7 +31,7 @@
 all: $(LIB)
 
 $(LIB): $(OBJSPIC)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound
 
 
 %.o: %.c