diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2011-11-24 00:03:08 +1100 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2011-11-24 00:06:02 +1100 |
| commit | e09d46238b85554610d2f28826932d62da89e00c (patch) | |
| tree | b0e73b1a607bded8a8a406c2d912bd7934eac45a /mjpegtools | |
| parent | 84851c8382d205240e838591692adffdac3d3a14 (diff) | |
| download | contrib-e09d46238b85554610d2f28826932d62da89e00c.tar.gz contrib-e09d46238b85554610d2f28826932d62da89e00c.tar.xz | |
Revert "mjpegtools: 1.9.0 -> 2.0.0"
This reverts commit 5dbf9e5f47e6b9201ea52acbedf598b8d30a4515.
Diffstat (limited to 'mjpegtools')
| -rw-r--r-- | mjpegtools/.footprint | 47 | ||||
| -rw-r--r-- | mjpegtools/.md5sum | 3 | ||||
| -rw-r--r-- | mjpegtools/Pkgfile | 8 | ||||
| -rw-r--r-- | mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch | 12 |
4 files changed, 43 insertions, 27 deletions
diff --git a/mjpegtools/.footprint b/mjpegtools/.footprint index 2fe2402cb..2b1c8f933 100644 --- a/mjpegtools/.footprint +++ b/mjpegtools/.footprint @@ -83,8 +83,9 @@ drwxr-xr-x root/root usr/include/mjpegtools/mpeg2enc/ -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/mpeg2encoptions.hh -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/mpeg2encparams.h -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h --rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/ontheflyratectlpass1.hh --rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/ontheflyratectlpass2.hh +-rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/ontheflyratectl.hh +-rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/pass1ratectl.hh +-rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/pass2ratectl.hh -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/picture.hh -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/picturereader.hh -rw-r--r-- root/root usr/include/mjpegtools/mpeg2enc/predict_ref.h @@ -115,34 +116,34 @@ drwxr-xr-x root/root usr/include/mjpegtools/mplex/ -rw-r--r-- root/root usr/include/mjpegtools/mplex/videostrm.hpp -rw-r--r-- root/root usr/include/mjpegtools/yuv4mpeg.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/liblavfile-2.0.so.0 -> liblavfile-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/liblavfile-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavfile-1.9.so.0 -> liblavfile-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liblavfile-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/liblavfile.la -lrwxrwxrwx root/root usr/lib/liblavfile.so -> liblavfile-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liblavjpeg-2.0.so.0 -> liblavjpeg-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/liblavjpeg-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavfile.so -> liblavfile-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavjpeg-1.9.so.0 -> liblavjpeg-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liblavjpeg-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/liblavjpeg.la -lrwxrwxrwx root/root usr/lib/liblavjpeg.so -> liblavjpeg-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liblavplay-2.0.so.0 -> liblavplay-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/liblavplay-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavjpeg.so -> liblavjpeg-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavplay-1.9.so.0 -> liblavplay-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liblavplay-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/liblavplay.la -lrwxrwxrwx root/root usr/lib/liblavplay.so -> liblavplay-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/liblavrec-2.0.so.0 -> liblavrec-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/liblavrec-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavplay.so -> liblavplay-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavrec-1.9.so.0 -> liblavrec-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/liblavrec-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/liblavrec.la -lrwxrwxrwx root/root usr/lib/liblavrec.so -> liblavrec-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libmjpegutils-2.0.so.0 -> libmjpegutils-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/libmjpegutils-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/liblavrec.so -> liblavrec-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmjpegutils-1.9.so.0 -> libmjpegutils-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libmjpegutils-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/libmjpegutils.la -lrwxrwxrwx root/root usr/lib/libmjpegutils.so -> libmjpegutils-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libmpeg2encpp-2.0.so.0 -> libmpeg2encpp-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/libmpeg2encpp-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmjpegutils.so -> libmjpegutils-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmpeg2encpp-1.9.so.0 -> libmpeg2encpp-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libmpeg2encpp-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/libmpeg2encpp.la -lrwxrwxrwx root/root usr/lib/libmpeg2encpp.so -> libmpeg2encpp-2.0.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libmplex2-2.0.so.0 -> libmplex2-2.0.so.0.0.0 --rwxr-xr-x root/root usr/lib/libmplex2-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmpeg2encpp.so -> libmpeg2encpp-1.9.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmplex2-1.9.so.0 -> libmplex2-1.9.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libmplex2-1.9.so.0.0.0 -rwxr-xr-x root/root usr/lib/libmplex2.la -lrwxrwxrwx root/root usr/lib/libmplex2.so -> libmplex2-2.0.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libmplex2.so -> libmplex2-1.9.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/mjpegtools.pc drwxr-xr-x root/root usr/man/ diff --git a/mjpegtools/.md5sum b/mjpegtools/.md5sum index 80e9c7fc4..c8d232ea8 100644 --- a/mjpegtools/.md5sum +++ b/mjpegtools/.md5sum @@ -1 +1,2 @@ -903e1e3b967eebcc5fe5626d7517dc46 mjpegtools-2.0.0.tar.gz +35480a6eb4ca5f90660890022dd97ae2 mjpegtools-1.9.0-glibc-2.10.patch +309a6fcf0900a010d6a9c1e91afc2f5c mjpegtools-1.9.0.tar.gz diff --git a/mjpegtools/Pkgfile b/mjpegtools/Pkgfile index a80aedaa3..c9aee68af 100644 --- a/mjpegtools/Pkgfile +++ b/mjpegtools/Pkgfile @@ -5,12 +5,14 @@ # Depends on: libquicktime xorg-libxxf86dga name=mjpegtools -version=2.0.0 -release=1 -source=(http://downloads.sourceforge.net/project/mjpeg/$name/$version/$name-$version.tar.gz) +version=1.9.0 +release=2 +source=(http://downloads.sourceforge.net/project/mjpeg/$name/$version/$name-$version.tar.gz + mjpegtools-1.9.0-glibc-2.10.patch) build() { cd $name-$version + patch -p 1 -i $SRC/mjpegtools-1.9.0-glibc-2.10.patch ./configure \ --prefix=/usr \ diff --git a/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch b/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch new file mode 100644 index 000000000..2abeb3b58 --- /dev/null +++ b/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch @@ -0,0 +1,12 @@ +diff -pruN mjpegtools-1.9.0.orig/mplex/lpcmstrm_in.cpp mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp +--- mjpegtools-1.9.0.orig/mplex/lpcmstrm_in.cpp 2009-11-03 09:12:41.193553723 +0000 ++++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-11-03 09:13:54.740427219 +0000 +@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs, + + bool LPCMStream::Probe(IBitStream &bs ) + { +- char *last_dot = strrchr( bs.StreamName(), '.' ); ++ const char *last_dot = strrchr( bs.StreamName(), '.' ); + return + last_dot != NULL + && strcmp( last_dot+1, "lpcm") == 0; |