mjpegtools: 1.9.0 -> 2.0.0

4 files changed, 27 insertions, 43 deletions

diff --git a/mjpegtools/.footprint b/mjpegtools/.footprint
index 2b1c8f933..2fe2402cb 100644
--- a/mjpegtools/.footprint
+++ b/mjpegtools/.footprint
@@ -83,9 +83,8 @@ 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/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/ontheflyratectlpass1.hh
+-rw-r--r--	root/root	usr/include/mjpegtools/mpeg2enc/ontheflyratectlpass2.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
@@ -116,34 +115,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-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
+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
 -rwxr-xr-x	root/root	usr/lib/liblavfile.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/liblavjpeg.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/liblavplay.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/liblavrec.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/libmjpegutils.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/libmpeg2encpp.la
-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
+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
 -rwxr-xr-x	root/root	usr/lib/libmplex2.la
-lrwxrwxrwx	root/root	usr/lib/libmplex2.so -> libmplex2-1.9.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libmplex2.so -> libmplex2-2.0.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 c8d232ea8..80e9c7fc4 100644
--- a/mjpegtools/.md5sum
+++ b/mjpegtools/.md5sum
@@ -1,2 +1 @@
-35480a6eb4ca5f90660890022dd97ae2  mjpegtools-1.9.0-glibc-2.10.patch
-309a6fcf0900a010d6a9c1e91afc2f5c  mjpegtools-1.9.0.tar.gz
+903e1e3b967eebcc5fe5626d7517dc46  mjpegtools-2.0.0.tar.gz
diff --git a/mjpegtools/Pkgfile b/mjpegtools/Pkgfile
index c9aee68af..a80aedaa3 100644
--- a/mjpegtools/Pkgfile
+++ b/mjpegtools/Pkgfile
@@ -5,14 +5,12 @@
 # Depends on: libquicktime xorg-libxxf86dga
 
 name=mjpegtools
-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)
+version=2.0.0
+release=1
+source=(http://downloads.sourceforge.net/project/mjpeg/$name/$version/$name-$version.tar.gz)
 
 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
deleted file mode 100644
index 2abeb3b58..000000000
--- a/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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;