Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > contrib-release-src > by-pkgid > ae59112a30001eabd903cc2e23296630 > files > 3

xbmc-9.11-1.svn29467.pvr_testing2.1mdv2010.1.src.rpm

diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in newdir/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in	2010-04-11 19:49:16.840516606 +0300
@@ -55,7 +55,7 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPE
 
 $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
 	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
-		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+		`cat $(WRAPPER:.o=.def)` $(WRAPPER) -ldl
 
 endif
 
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/AC3Codec/Makefile.in newdir/xbmc/cores/paplayer/AC3Codec/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/AC3Codec/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/AC3Codec/Makefile.in	2010-04-11 19:49:16.963323739 +0300
@@ -21,7 +21,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	chmod +x $@
 else
 	$(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
-		`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+		`cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -lm
 endif
 
 include ../../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/ADPCMCodec/Makefile.in newdir/xbmc/cores/paplayer/ADPCMCodec/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/ADPCMCodec/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/ADPCMCodec/Makefile.in	2010-04-11 19:49:17.126267403 +0300
@@ -11,7 +11,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 	chmod +x $@
 else
-	$(CC) $(CFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+	$(CXX) $(CFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
 endif
 
 include ../../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/NSFCodec/Makefile.in newdir/xbmc/cores/paplayer/NSFCodec/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/NSFCodec/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/NSFCodec/Makefile.in	2010-04-11 19:49:17.127519312 +0300
@@ -20,7 +20,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 	chmod +x $@
 else
-	$(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+	$(CXX) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -lm
 endif
 
 include ../../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/SIDCodec/Makefile.in newdir/xbmc/cores/paplayer/SIDCodec/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/SIDCodec/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/SIDCodec/Makefile.in	2010-04-11 19:49:17.128517631 +0300
@@ -17,7 +17,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 	chmod +x $@
 else
-	$(CC) $(CFLAGS) -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o
+	$(CXX) $(CFLAGS) -shared -o $@ $(OBJS) ../../../linux/XHandle.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o -lSDL -lm
 endif
 
 include ../../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in newdir/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in	2010-04-11 19:49:17.129517670 +0300
@@ -25,7 +25,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	../../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 	chmod +x $@
 else
-	$(CC) $(CFLAGS) -shared -o $@ $(OBJS) \
+	$(CXX) $(CFLAGS) -shared -o $@ $(OBJS) \
 		`cat ../../../../DllLoader/exports/wrapper.def` ../../../../DllLoader/exports/wrapper.o
 endif
 
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/vgmstream/Makefile.in newdir/xbmc/cores/paplayer/vgmstream/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/vgmstream/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/vgmstream/Makefile.in	2010-04-11 19:49:17.130527868 +0300
@@ -79,6 +79,7 @@ META_OBJS=src/meta/aax.o \
           src/meta/gca.o \
           src/meta/gcsw.o \
           src/meta/genh.o \
+          src/meta/gsp_gsb.o \
           src/meta/halpst.o \
           src/meta/idsp.o \
           src/meta/ish_isd.o \
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in newdir/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in	2010-04-11 19:49:17.132515989 +0300
@@ -17,7 +17,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	../../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 	chmod +x $@
 else
-	$(CC) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
+	$(CXX) $(CFLAGS) -shared -o $@ $(OBJS) `cat ../../../DllLoader/exports/wrapper.def` ../../../DllLoader/exports/wrapper.o
 endif
 
 include ../../../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/lib/libass/xbmc/Makefile.in newdir/xbmc/lib/libass/xbmc/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/lib/libass/xbmc/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/lib/libass/xbmc/Makefile.in	2010-04-11 19:49:17.133516469 +0300
@@ -20,7 +20,7 @@ else
 $(SLIB): ../libass/.libs/libass.so
 	$(CXX) -shared -fPIC -o $(SLIB) ../libass/.libs/*.o \
 	  `cat ../../../cores/DllLoader/exports/wrapper.def` \
-	  ../../../cores/DllLoader/exports/wrapper.o
+	  ../../../cores/DllLoader/exports/wrapper.o -lfreetype -lfontconfig -lenca
 
 ../libass/.libs/libass.so: compile
 	$(MAKE) -C ..
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/lib/libhdhomerun/Makefile.in newdir/xbmc/lib/libhdhomerun/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/lib/libhdhomerun/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/lib/libhdhomerun/Makefile.in	2010-04-11 19:49:17.134516349 +0300
@@ -29,7 +29,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	chmod +x $@
 else
 	$(CC) $(CFLAGS) $(OBJS) -shared -o $@ `cat ../../cores/DllLoader/exports/wrapper.def` \
-		../../cores/DllLoader/exports/wrapper.o
+		../../cores/DllLoader/exports/wrapper.o -pthread
 endif
 	
 hdhomerun_dll : $(OBJS)
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/lib/libid3tag/Makefile.in newdir/xbmc/lib/libid3tag/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/lib/libid3tag/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/lib/libid3tag/Makefile.in	2010-04-11 19:49:17.135517307 +0300
@@ -18,7 +18,7 @@ else
 $(SLIB): libid3tag/.libs/libid3tag.so
 	$(CXX) $(CXXFLAGS) -shared -fPIC -o $@ libid3tag/.libs/*.o \
 		`cat ../../cores/DllLoader/exports/wrapper.def` \
-		../../cores/DllLoader/exports/wrapper.o
+		../../cores/DllLoader/exports/wrapper.o -lz
 endif
 
 ifeq ($(findstring osx,$(ARCH)), osx)
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in newdir/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in	2010-04-11 19:49:17.137517186 +0300
@@ -30,7 +30,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 		-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
 		-o $(SOLARWINDS-OUT) $(RSXS)/src/solarwinds/*.o $(RSXS-OBJS)
 else
-	$(CXX) $(CXXFLAGS) -shared -o $(SOLARWINDS-OUT) $(RSXS)/src/solarwinds/*.o $(RSXS-OBJS) -lXmu
+	$(CXX) $(CXXFLAGS) -shared -o $(SOLARWINDS-OUT) $(RSXS)/src/solarwinds/*.o $(RSXS-OBJS) -lXmu -lGL -lGLU
 endif
 
 $(PLASMA-OUT): $(PLASMA-DEP)
@@ -39,7 +39,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 		-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
 		-o $(PLASMA-OUT)     $(RSXS)/src/plasma/*.o     $(RSXS-OBJS)
 else
-	$(CXX) $(CXXFLAGS) -shared -o $(PLASMA-OUT)     $(RSXS)/src/plasma/*.o     $(RSXS-OBJS) -lXmu
+	$(CXX) $(CXXFLAGS) -shared -o $(PLASMA-OUT)     $(RSXS)/src/plasma/*.o     $(RSXS-OBJS) -lXmu -lGL -lGLU
 endif
 
 $(EUPHORIA-OUT): $(EUPHORIA-DEP)
@@ -48,7 +48,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 		-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
 		-o $(EUPHORIA-OUT)   $(RSXS)/src/euphoria/*.o   $(RSXS-OBJS)
 else
-	$(CXX) $(CXXFLAGS) -shared -o $(EUPHORIA-OUT)   $(RSXS)/src/euphoria/*.o   $(RSXS-OBJS) -lXmu
+	$(CXX) $(CXXFLAGS) -shared -o $(EUPHORIA-OUT)   $(RSXS)/src/euphoria/*.o   $(RSXS-OBJS) $(RSXS)/src/pngimage.o -lXmu -lGL -lGLU -lpng
 endif
 
 $(SOLARWINDS-DEP) : $(RSXS)
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/visualizations/Goom/Makefile.in newdir/xbmc/visualizations/Goom/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/visualizations/Goom/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/visualizations/Goom/Makefile.in	2010-04-11 19:49:17.138518785 +0300
@@ -14,7 +14,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 else
 	$(CXX) -fPIC goom2k4-0/src/*.o -shared $(CXXFLAGS) -o $(SLIB) $(OBJS) \
 		`cat ../../cores/DllLoader/exports/wrapper.def` \
-		../../cores/DllLoader/exports/wrapper.o
+		../../cores/DllLoader/exports/wrapper.o -lGL
 endif
 	@find net.sf.goom.vis -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*\.pvr|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" ../../../addons/"{}" \; -printf " -- %-75.75f\r"
 	@find net.sf.goom.vis -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis\.vis" -iregex ".*\.vis" -exec install -D "{}" ../../../addons/"{}" \; -printf " -- %-75.75f\r"
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/visualizations/OpenGLSpectrum/Makefile.in newdir/xbmc/visualizations/OpenGLSpectrum/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/visualizations/OpenGLSpectrum/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/visualizations/OpenGLSpectrum/Makefile.in	2010-04-11 19:52:48.703265828 +0300
@@ -12,7 +12,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	$(CXX) $(CXXFLAGS) -bundle -shared -flat_namespace -undefined suppress -o $@ $(OBJS)
 	../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 else
-	$(CXX) $(CXXFLAGS) -shared -g -o $(SLIB) $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared -g -o $(SLIB) $(OBJS) -lGL
 endif
 
 include ../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/visualizations/WaveForm/Makefile.in newdir/xbmc/visualizations/WaveForm/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/visualizations/WaveForm/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/visualizations/WaveForm/Makefile.in	2010-04-11 19:49:17.238517325 +0300
@@ -12,7 +12,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 	$(CXX) -bundle -shared -flat_namespace -undefined suppress -o $(SLIB) $(OBJS)
 	../../../tools/Mach5/wrapper.rb $@;mv output.so $@
 else
-	$(CXX) $(CFLAGS) -shared -g -o $(SLIB) $(OBJS)
+	$(CXX) $(CFLAGS) -shared -g -o $(SLIB) $(OBJS) -lGL -lGLU
 endif
 
 include ../../../Makefile.include
diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' -x '*.swp' xbmc-pvr-testing2-29139/xbmc/visualizations/XBMCProjectM/Makefile.in newdir/xbmc/visualizations/XBMCProjectM/Makefile.in
--- xbmc-pvr-testing2-29139/xbmc/visualizations/XBMCProjectM/Makefile.in	2010-04-09 10:54:10.000000000 +0300
+++ newdir/xbmc/visualizations/XBMCProjectM/Makefile.in	2010-04-11 19:54:50.263267848 +0300
@@ -20,7 +20,7 @@ libprojectM/libprojectM.dylib:
 	$(MAKE) -C libprojectM
 else
 $(SLIB): $(OBJS) libprojectM/libprojectM.so
-	$(CXX) $(CXXFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o
+	$(CXX) $(CXXFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat ../../cores/DllLoader/exports/wrapper.def` ../../cores/DllLoader/exports/wrapper.o -lGLEW -lGL -ldl -pthread
 #	cp -rfT libprojectM/presets ../../../visualisations/projectM
 
 libprojectM/libprojectM.so:

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional