From: <tro...@us...> - 2012-04-29 21:35:43
|
Revision: 4590 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=4590&view=rev Author: tropikhajma2 Date: 2012-04-29 21:35:36 +0000 (Sun, 29 Apr 2012) Log Message: ----------- encumbered/SFEmplayer2.spec: make mplayer2 work with current liveMedia; refresh patches for current snapshot Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/encumbered/SFEmplayer2.spec Added Paths: ----------- spec-files-extra/trunk/patches/mplayer2-04-realplayer.diff spec-files-extra/trunk/patches/mplayer2-05-cpudetect.diff spec-files-extra/trunk/patches/mplayer2-07-liveMedia.diff spec-files-extra/trunk/patches/mplayer2-08-liveMedia-config.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2012-04-29 17:14:36 UTC (rev 4589) +++ spec-files-extra/trunk/ChangeLog 2012-04-29 21:35:36 UTC (rev 4590) @@ -24,6 +24,8 @@ * encumbered/SFEffmpeg.spec base-specs/ffmpeg.spec: bump to 0.10.2, really add libvpx dependency * patches/blas-01-shared.diff base-specs/blas.spec SFEblas.spec: added shared library + * encumbered/SFEmplayer2.spec, patches/mplayer2-*: make mplayer2 work + with current liveMedia; refresh patches for current snapshot 2012-04-28 Logan O'Sullivan Bruns <lo...@ge...> Modified: spec-files-extra/trunk/encumbered/SFEmplayer2.spec =================================================================== --- spec-files-extra/trunk/encumbered/SFEmplayer2.spec 2012-04-29 17:14:36 UTC (rev 4589) +++ spec-files-extra/trunk/encumbered/SFEmplayer2.spec 2012-04-29 21:35:36 UTC (rev 4590) @@ -48,8 +48,11 @@ # with the new ffmpeg API Source: http://git.mplayer2.org/mplayer2/snapshot/mplayer2-master.tar.bz2 Patch3: mplayer-snap-03-ldflags.diff -Patch4: mplayer-snap-04-realplayer.diff -Patch5: mplayer-snap-05-cpudetect.diff +Patch4: mplayer2-04-realplayer.diff +Patch5: mplayer2-05-cpudetect.diff +#https://bugs.archlinux.org/task/28759 +Patch7: mplayer2-07-liveMedia.diff +Patch8: mplayer2-08-liveMedia-config.diff SUNW_BaseDir: %_basedir BuildRoot: %_tmppath/%name-build @@ -137,8 +140,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch7 -p1 +%patch8 -p1 - %build CPUS=$(psrinfo | gawk '$2=="on-line"{cpus++}END{print (cpus==0)?1:cpus}') @@ -169,7 +173,7 @@ --mandir=%_mandir \ --libdir=%_libdir \ --confdir=%_sysconfdir \ - --extra-cflags="-I/usr/lib/live/liveMedia/include -I/usr/lib/live/groupsock/include -I/usr/lib/live/UsageEnvironment/include -I/usr/lib/live/BasicUsageEnvironment/include" \ + --extra-cflags="-I/usr/lib/live" \ --extra-ldflags="-L/usr/lib/live/liveMedia -R/usr/lib/live/liveMedia -L/usr/lib/live/groupsock -R/usr/lib/live/groupsock -L/usr/lib/live/UsageEnvironment -R/usr/lib/live/UsageEnvironment -L/usr/lib/live/BasicUsageEnvironment -R/usr/lib/live/BasicUsageEnvironment -Wl,-Mmapfile" \ --extra-libs="-lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -liconv" \ --enable-faad \ @@ -245,6 +249,8 @@ %endif %changelog +* Sun Apr 29 2012 - Pavel Heimlich +- make mplayer2 work with current liveMedia * Tue Jan 24 2012 - James Choi - Intel/AMD detection override * Mon Dec 12 2012 - Thomas Wagner Added: spec-files-extra/trunk/patches/mplayer2-04-realplayer.diff =================================================================== --- spec-files-extra/trunk/patches/mplayer2-04-realplayer.diff (rev 0) +++ spec-files-extra/trunk/patches/mplayer2-04-realplayer.diff 2012-04-29 21:35:36 UTC (rev 4590) @@ -0,0 +1,11 @@ +--- mplayer/configure.orig 2012-04-29 15:22:57.849822352 +0200 ++++ mplayer/configure 2012-04-29 16:01:27.685539533 +0200 +@@ -5598,7 +5598,7 @@ + _real=no + res_comment="dynamic loader support needed" + if test "$_dl" = yes || test "$_win32dll" = yes && +- (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32) ; then ++ (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32 || sunos) ; then + _real=yes + fi + fi Added: spec-files-extra/trunk/patches/mplayer2-05-cpudetect.diff =================================================================== --- spec-files-extra/trunk/patches/mplayer2-05-cpudetect.diff (rev 0) +++ spec-files-extra/trunk/patches/mplayer2-05-cpudetect.diff 2012-04-29 21:35:36 UTC (rev 4590) @@ -0,0 +1,32 @@ +--- mplayer/cpudetect.c.orig 2012-04-28 20:47:53.000000000 +0200 ++++ mplayer/cpudetect.c 2012-04-29 16:05:31.334903646 +0200 +@@ -42,6 +42,8 @@ + #include <windows.h> + #elif defined(__AMIGAOS4__) + #include <proto/exec.h> ++#elif __sun ++#include <sys/utsname.h> + #endif + + /* Thanks to the FreeBSD project for some of this cpuid code, and +@@ -104,6 +106,20 @@ + #if ARCH_X86_64 + gCpuCaps.hasSSE=1; + gCpuCaps.hasSSE2=1; ++#elif defined(__sun) ++ struct utsname solname; ++ long major, minor = 0; ++ char *radix; ++ ++ if (uname(&solname) > 0) { ++ major = strtol(solname.release, &radix, 10); ++ if (*radix != '\0') ++ minor = strtol(++radix, NULL, 10); ++ if (!(major >= 5 && minor >= 9)) ++ gCpuCaps.hasSSE=0; ++ } else { ++ gCpuCaps.hasSSE=0; ++ } + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) + int has_sse=0, ret; + size_t len=sizeof(has_sse); Added: spec-files-extra/trunk/patches/mplayer2-07-liveMedia.diff =================================================================== --- spec-files-extra/trunk/patches/mplayer2-07-liveMedia.diff (rev 0) +++ spec-files-extra/trunk/patches/mplayer2-07-liveMedia.diff 2012-04-29 21:35:36 UTC (rev 4590) @@ -0,0 +1,10 @@ +--- mplayer2-master/libmpdemux/demux_rtp.cpp.orig 2012-04-29 18:25:31.478905162 +0200 ++++ mplayer2-master/libmpdemux/demux_rtp.cpp 2012-04-29 18:26:06.584429935 +0200 +@@ -24,6 +24,7 @@ + #ifdef __MINGW32__ // with. they are each protected from + #include <windows.h> // windows.h, but not the other way around. + #endif ++#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 + #include "demux_rtp.h" + #include "stream/stream.h" + #include "stheader.h" Added: spec-files-extra/trunk/patches/mplayer2-08-liveMedia-config.diff =================================================================== --- spec-files-extra/trunk/patches/mplayer2-08-liveMedia-config.diff (rev 0) +++ spec-files-extra/trunk/patches/mplayer2-08-liveMedia-config.diff 2012-04-29 21:35:36 UTC (rev 4590) @@ -0,0 +1,17 @@ +--- mplayer2-master/configure.orig 2012-04-28 20:47:53.000000000 +0200 ++++ mplayer2-master/configure 2012-04-29 22:41:40.350194287 +0200 +@@ -5663,10 +5662,10 @@ + for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do + cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/groupsock/include && + _livelibdir=$(echo $I| sed s/-I//) && +- extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \ +- $_livelibdir/groupsock/libgroupsock.a \ +- $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ +- $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ ++ extra_ldflags="$_livelibdir/liveMedia/libliveMedia.so \ ++ $_livelibdir/groupsock/libgroupsock.so \ ++ $_livelibdir/UsageEnvironment/libUsageEnvironment.so \ ++ $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.so \ + $extra_ldflags -lstdc++" \ + extra_cxxflags="-I$_livelibdir/liveMedia/include \ + -I$_livelibdir/UsageEnvironment/include \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |