diff options
author | tnut <tnut at nutyx dot com> | 2011-08-21 13:09:59 +0200 |
---|---|---|
committer | tnut <tnut at nutyx dot com> | 2011-08-21 13:09:59 +0200 |
commit | da752f508ec427e561f20f123abf6ce91043c0d3 (patch) | |
tree | 0d5a82e7caa3b4aedde9af03610f58f4796b7a71 | |
parent | fd654eaf77adf89164ce30825989286240fc3c4e (diff) | |
parent | b4bca1a0206c85e36453840dffe5ca3c96bc5826 (diff) | |
download | nutyx-pakxe-da752f508ec427e561f20f123abf6ce91043c0d3.tar.gz nutyx-pakxe-da752f508ec427e561f20f123abf6ce91043c0d3.tar.bz2 nutyx-pakxe-da752f508ec427e561f20f123abf6ce91043c0d3.tar.xz nutyx-pakxe-da752f508ec427e561f20f123abf6ce91043c0d3.zip |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r-- | base/live/.footprint.i686 | 8 | ||||
-rw-r--r-- | base/live/.footprint.x86_64 | 8 | ||||
-rw-r--r-- | base/live/.md5sum.i686 | 2 | ||||
-rw-r--r-- | base/live/.md5sum.x86_64 | 2 | ||||
-rw-r--r-- | base/live/Pkgfile | 2 | ||||
-rw-r--r-- | extra/smpeg/Pkgfile | 5 |
6 files changed, 13 insertions, 14 deletions
diff --git a/base/live/.footprint.i686 b/base/live/.footprint.i686 index 68fea03e9..cc0c0a427 100644 --- a/base/live/.footprint.i686 +++ b/base/live/.footprint.i686 @@ -25,8 +25,8 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/testWAVAudioStreamer -rwxr-xr-x root/root usr/bin/vobStreamer drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libliveMedia.so -> libliveMedia.so.2011.08.13 -lrwxrwxrwx root/root usr/lib/libliveMedia.so.2011.08.13 -> live/libliveMedia.so.2011.08.13 +lrwxrwxrwx root/root usr/lib/libliveMedia.so -> libliveMedia.so.2011.08.20 +lrwxrwxrwx root/root usr/lib/libliveMedia.so.2011.08.20 -> live/libliveMedia.so.2011.08.20 drwxr-xr-x root/root usr/lib/live/ drwxr-xr-x root/root usr/lib/live/BasicUsageEnvironment/ drwxr-xr-x root/root usr/lib/live/BasicUsageEnvironment/include/ @@ -57,8 +57,8 @@ drwxr-xr-x root/root usr/lib/live/groupsock/include/ -r--r--r-- root/root usr/lib/live/groupsock/include/TunnelEncaps.hh -r--r--r-- root/root usr/lib/live/groupsock/include/groupsock_version.hh -rw-r--r-- root/root usr/lib/live/groupsock/libgroupsock.a -lrwxrwxrwx root/root usr/lib/live/libliveMedia.so -> libliveMedia.so.2011.08.13 --rwxr-xr-x root/root usr/lib/live/libliveMedia.so.2011.08.13 +lrwxrwxrwx root/root usr/lib/live/libliveMedia.so -> libliveMedia.so.2011.08.20 +-rwxr-xr-x root/root usr/lib/live/libliveMedia.so.2011.08.20 drwxr-xr-x root/root usr/lib/live/liveMedia/ drwxr-xr-x root/root usr/lib/live/liveMedia/include/ -r--r--r-- root/root usr/lib/live/liveMedia/include/AC3AudioFileServerMediaSubsession.hh diff --git a/base/live/.footprint.x86_64 b/base/live/.footprint.x86_64 index 68fea03e9..cc0c0a427 100644 --- a/base/live/.footprint.x86_64 +++ b/base/live/.footprint.x86_64 @@ -25,8 +25,8 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/testWAVAudioStreamer -rwxr-xr-x root/root usr/bin/vobStreamer drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libliveMedia.so -> libliveMedia.so.2011.08.13 -lrwxrwxrwx root/root usr/lib/libliveMedia.so.2011.08.13 -> live/libliveMedia.so.2011.08.13 +lrwxrwxrwx root/root usr/lib/libliveMedia.so -> libliveMedia.so.2011.08.20 +lrwxrwxrwx root/root usr/lib/libliveMedia.so.2011.08.20 -> live/libliveMedia.so.2011.08.20 drwxr-xr-x root/root usr/lib/live/ drwxr-xr-x root/root usr/lib/live/BasicUsageEnvironment/ drwxr-xr-x root/root usr/lib/live/BasicUsageEnvironment/include/ @@ -57,8 +57,8 @@ drwxr-xr-x root/root usr/lib/live/groupsock/include/ -r--r--r-- root/root usr/lib/live/groupsock/include/TunnelEncaps.hh -r--r--r-- root/root usr/lib/live/groupsock/include/groupsock_version.hh -rw-r--r-- root/root usr/lib/live/groupsock/libgroupsock.a -lrwxrwxrwx root/root usr/lib/live/libliveMedia.so -> libliveMedia.so.2011.08.13 --rwxr-xr-x root/root usr/lib/live/libliveMedia.so.2011.08.13 +lrwxrwxrwx root/root usr/lib/live/libliveMedia.so -> libliveMedia.so.2011.08.20 +-rwxr-xr-x root/root usr/lib/live/libliveMedia.so.2011.08.20 drwxr-xr-x root/root usr/lib/live/liveMedia/ drwxr-xr-x root/root usr/lib/live/liveMedia/include/ -r--r--r-- root/root usr/lib/live/liveMedia/include/AC3AudioFileServerMediaSubsession.hh diff --git a/base/live/.md5sum.i686 b/base/live/.md5sum.i686 index eafdf0523..b3b21aa08 100644 --- a/base/live/.md5sum.i686 +++ b/base/live/.md5sum.i686 @@ -1 +1 @@ -0ef56c4bf6be8cc4e31656c7293e50de live.2011.08.13.tar.gz +ffb01bb0f9518ff290e3d64040c7eb7a live.2011.08.20.tar.gz diff --git a/base/live/.md5sum.x86_64 b/base/live/.md5sum.x86_64 index eafdf0523..b3b21aa08 100644 --- a/base/live/.md5sum.x86_64 +++ b/base/live/.md5sum.x86_64 @@ -1 +1 @@ -0ef56c4bf6be8cc4e31656c7293e50de live.2011.08.13.tar.gz +ffb01bb0f9518ff290e3d64040c7eb7a live.2011.08.20.tar.gz diff --git a/base/live/Pkgfile b/base/live/Pkgfile index 7c859a822..7553e368b 100644 --- a/base/live/Pkgfile +++ b/base/live/Pkgfile @@ -6,7 +6,7 @@ # Run on: name=live -version=2011.08.13 +version=2011.08.20 release=1 source=(http://www.live555.com/liveMedia/public/${name}.$version.tar.gz) diff --git a/extra/smpeg/Pkgfile b/extra/smpeg/Pkgfile index 3cf61db25..118f00c15 100644 --- a/extra/smpeg/Pkgfile +++ b/extra/smpeg/Pkgfile @@ -7,7 +7,7 @@ name=smpeg version=0.4.4 -release=3 +release=4 source=(http://gentoo.osuosl.org/distfiles/smpeg-$version.tar.gz \ smpeg-mpegaudiosdl.patch) @@ -25,6 +25,5 @@ build() { make install DESTDIR=$PKG rm $PKG/usr/share/man/man1/gtv.1 + sed -i "s/AC_DEFUN(AM_PATH_SMPEG/AC_DEFUN([AM_PATH_SMPEG]/" $PKG/usr/share/aclocal/smpeg.m4 } - - |