June 2016 - crux-commits

ports/opt (3.2): wine: update gecko
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit 9b4aceb189afa62c454e34b1b55e1e9a7053f218 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 18:39:37 2016 +1000 wine: update gecko diff --git a/wine/.footprint b/wine/.footprint index a38065c..f3bede5 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -3952,8 +3952,8 @@ drwxr-xr-x root/root usr/share/wine/fonts/ -rw-r--r-- root/root usr/share/wine/fonts/vgasyst.fon -rw-r--r-- root/root usr/share/wine/fonts/wingding.ttf drwxr-xr-x root/root usr/share/wine/gecko/ --rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.44-x86.msi --rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.44-x86_64.msi +-rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.47-x86.msi +-rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.47-x86_64.msi -rw-r--r-- root/root usr/share/wine/l_intl.nls drwxr-xr-x root/root usr/share/wine/mono/ -rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.6.3.msi diff --git a/wine/.md5sum b/wine/.md5sum index fa364cc..cb67b14 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,4 @@ 0ef601ed1eb8e9b800eb0ee334d7ad6a wine-1.9.13.tar.bz2 f38640271249fca9da0e18f5dc9861e2 wine-mono-4.6.3.msi -f6ff2bb5dddc144726bd9a955fb16649 wine_gecko-2.44-x86.msi -59e7a37dcdc87f5e4f030bfafbb1c0d6 wine_gecko-2.44-x86_64.msi +5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi +d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index d04881e..17b2270 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -8,8 +8,8 @@ name=wine version=1.9.13 release=1 source=(http://dl.winehq.org/wine/source/1.9/$name-$version.tar.bz2 - http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86.msi - http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86_64.msi + http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi + http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi http://dl.winehq.org/wine/wine-mono/4.6.3/wine-mono-4.6.3.msi) build() { @@ -50,8 +50,8 @@ build() { install -d $PKG/usr/share/wine/mono install -t $PKG/usr/share/wine/gecko/ \ - $SRC/wine_gecko-2.44-x86.msi \ - $SRC/wine_gecko-2.44-x86_64.msi + $SRC/wine_gecko-2.47-x86.msi \ + $SRC/wine_gecko-2.47-x86_64.msi install $SRC/wine-mono-4.6.3.msi $PKG/usr/share/wine/mono/

1 0

ports/compat-32 (3.2): expat-32: update footprint
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit 90af2a4348ddbb3df4e593ad449f1277c805b9f2 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 17:49:54 2016 +1000 expat-32: update footprint diff --git a/expat-32/.footprint b/expat-32/.footprint index a8b885d..35c6c79 100644 --- a/expat-32/.footprint +++ b/expat-32/.footprint @@ -2,8 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libexpat.a -rwxr-xr-x root/root usr/lib32/libexpat.la -lrwxrwxrwx root/root usr/lib32/libexpat.so -> libexpat.so.1.6.0 -lrwxrwxrwx root/root usr/lib32/libexpat.so.1 -> libexpat.so.1.6.0 --rwxr-xr-x root/root usr/lib32/libexpat.so.1.6.0 +lrwxrwxrwx root/root usr/lib32/libexpat.so -> libexpat.so.1.6.2 +lrwxrwxrwx root/root usr/lib32/libexpat.so.1 -> libexpat.so.1.6.2 +-rwxr-xr-x root/root usr/lib32/libexpat.so.1.6.2 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/expat.pc

1 0

ports/contrib (3.2): pidgin: add missing dep: cyrus-sasl
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit 078281cdb49818e49c1ded2a3a8b63f63718293c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 16:16:21 2016 +1000 pidgin: add missing dep: cyrus-sasl diff --git a/pidgin/Pkgfile b/pidgin/Pkgfile index 45c378a..bf84490 100644 --- a/pidgin/Pkgfile +++ b/pidgin/Pkgfile @@ -2,7 +2,7 @@ # URL: http://pidgin.im/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Simone Rota, sip at crux dot nu -# Depends on: dbus-glib farstream gtkspell nss startup-notification xorg-libxscrnsaver +# Depends on: dbus-glib farstream gtkspell nss startup-notification xorg-libxscrnsaver cyrus-sasl name=pidgin version=2.10.12

1 0

ports/contrib (3.2): gstreamer-vaapi: 0.6.1 -> 0.7.0
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit 4ed4f4c4b8a20101a86f7819b19bca04fd9a4520 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 16:10:33 2016 +1000 gstreamer-vaapi: 0.6.1 -> 0.7.0 diff --git a/gstreamer-vaapi/.footprint b/gstreamer-vaapi/.footprint index 9be5224..daacb93 100644 --- a/gstreamer-vaapi/.footprint +++ b/gstreamer-vaapi/.footprint @@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/vaapi/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidecoder_mpeg4.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidecoder_vc1.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidecoder_vp8.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidecoder_vp9.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidisplay.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidisplay_drm.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vaapi/gstvaapidisplay_egl.h @@ -62,31 +63,31 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvaapi.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvaapi_parse.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvaapi_parse.so --rw-r--r-- root/root usr/lib/libgstvaapi-1.6.a --rwxr-xr-x root/root usr/lib/libgstvaapi-1.6.la -lrwxrwxrwx root/root usr/lib/libgstvaapi-1.6.so -> libgstvaapi-1.6.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libgstvaapi-1.6.so.1 -> libgstvaapi-1.6.so.1.0.0 --rwxr-xr-x root/root usr/lib/libgstvaapi-1.6.so.1.0.0 --rw-r--r-- root/root usr/lib/libgstvaapi-drm-1.6.a --rwxr-xr-x root/root usr/lib/libgstvaapi-drm-1.6.la -lrwxrwxrwx root/root usr/lib/libgstvaapi-drm-1.6.so -> libgstvaapi-drm-1.6.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libgstvaapi-drm-1.6.so.1 -> libgstvaapi-drm-1.6.so.1.0.0 --rwxr-xr-x root/root usr/lib/libgstvaapi-drm-1.6.so.1.0.0 --rw-r--r-- root/root usr/lib/libgstvaapi-egl-1.6.a --rwxr-xr-x root/root usr/lib/libgstvaapi-egl-1.6.la -lrwxrwxrwx root/root usr/lib/libgstvaapi-egl-1.6.so -> libgstvaapi-egl-1.6.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libgstvaapi-egl-1.6.so.1 -> libgstvaapi-egl-1.6.so.1.0.0 --rwxr-xr-x root/root usr/lib/libgstvaapi-egl-1.6.so.1.0.0 --rw-r--r-- root/root usr/lib/libgstvaapi-glx-1.6.a --rwxr-xr-x root/root usr/lib/libgstvaapi-glx-1.6.la -lrwxrwxrwx root/root usr/lib/libgstvaapi-glx-1.6.so -> libgstvaapi-glx-1.6.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libgstvaapi-glx-1.6.so.1 -> libgstvaapi-glx-1.6.so.1.0.0 --rwxr-xr-x root/root usr/lib/libgstvaapi-glx-1.6.so.1.0.0 --rw-r--r-- root/root usr/lib/libgstvaapi-x11-1.6.a --rwxr-xr-x root/root usr/lib/libgstvaapi-x11-1.6.la -lrwxrwxrwx root/root usr/lib/libgstvaapi-x11-1.6.so -> libgstvaapi-x11-1.6.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libgstvaapi-x11-1.6.so.1 -> libgstvaapi-x11-1.6.so.1.0.0 --rwxr-xr-x root/root usr/lib/libgstvaapi-x11-1.6.so.1.0.0 +-rw-r--r-- root/root usr/lib/libgstvaapi-1.8.a +-rwxr-xr-x root/root usr/lib/libgstvaapi-1.8.la +lrwxrwxrwx root/root usr/lib/libgstvaapi-1.8.so -> libgstvaapi-1.8.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgstvaapi-1.8.so.0 -> libgstvaapi-1.8.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgstvaapi-1.8.so.0.0.0 +-rw-r--r-- root/root usr/lib/libgstvaapi-drm-1.8.a +-rwxr-xr-x root/root usr/lib/libgstvaapi-drm-1.8.la +lrwxrwxrwx root/root usr/lib/libgstvaapi-drm-1.8.so -> libgstvaapi-drm-1.8.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgstvaapi-drm-1.8.so.0 -> libgstvaapi-drm-1.8.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgstvaapi-drm-1.8.so.0.0.0 +-rw-r--r-- root/root usr/lib/libgstvaapi-egl-1.8.a +-rwxr-xr-x root/root usr/lib/libgstvaapi-egl-1.8.la +lrwxrwxrwx root/root usr/lib/libgstvaapi-egl-1.8.so -> libgstvaapi-egl-1.8.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgstvaapi-egl-1.8.so.0 -> libgstvaapi-egl-1.8.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgstvaapi-egl-1.8.so.0.0.0 +-rw-r--r-- root/root usr/lib/libgstvaapi-glx-1.8.a +-rwxr-xr-x root/root usr/lib/libgstvaapi-glx-1.8.la +lrwxrwxrwx root/root usr/lib/libgstvaapi-glx-1.8.so -> libgstvaapi-glx-1.8.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgstvaapi-glx-1.8.so.0 -> libgstvaapi-glx-1.8.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgstvaapi-glx-1.8.so.0.0.0 +-rw-r--r-- root/root usr/lib/libgstvaapi-x11-1.8.a +-rwxr-xr-x root/root usr/lib/libgstvaapi-x11-1.8.la +lrwxrwxrwx root/root usr/lib/libgstvaapi-x11-1.8.so -> libgstvaapi-x11-1.8.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgstvaapi-x11-1.8.so.0 -> libgstvaapi-x11-1.8.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgstvaapi-x11-1.8.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-vaapi-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-vaapi-drm-1.0.pc diff --git a/gstreamer-vaapi/.md5sum b/gstreamer-vaapi/.md5sum index 6dd49c2..3531d09 100644 --- a/gstreamer-vaapi/.md5sum +++ b/gstreamer-vaapi/.md5sum @@ -1 +1 @@ -f01425481bd161f57334dab7ab4069d3 gstreamer-vaapi-0.6.1.tar.bz2 +ce2d4921b8d9c78edd609d95e8c502d3 gstreamer-vaapi-0.7.0.tar.bz2 diff --git a/gstreamer-vaapi/Pkgfile b/gstreamer-vaapi/Pkgfile index 2f61ea7..7b51da5 100644 --- a/gstreamer-vaapi/Pkgfile +++ b/gstreamer-vaapi/Pkgfile @@ -5,7 +5,7 @@ # Depends on: gst-plugins-base gst-plugins-bad libva xorg-libxrandr libvpx name=gstreamer-vaapi -version=0.6.1 +version=0.7.0 release=1 source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$ver… @@ -14,7 +14,6 @@ build() { ./configure \ --prefix=/usr \ - --mandir=/usr/man \ --disable-builtin-libvpx make

1 0

ports/contrib (3.2): amrnb: add missing dep: unzip
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit aa7a9b382ac964c7d785f1d917c194c63cc8244b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 16:02:24 2016 +1000 amrnb: add missing dep: unzip diff --git a/amrnb/Pkgfile b/amrnb/Pkgfile index e9e42a2..7077296 100644 --- a/amrnb/Pkgfile +++ b/amrnb/Pkgfile @@ -2,11 +2,11 @@ # URL: http://www.penguin.cz/~utx/amr # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Danny Rawlins, crux at romster dot me -# Depends on: +# Depends on: unzip name=amrnb version=7.0.0.2 -release=1 +release=2 source=(http://ftp.penguin.cz/pub/users/utx/amr/$name-$version.tar.bz2 http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip) @@ -15,10 +15,7 @@ build() { cp $SRC/26104-700_ANSI_C_source_code.zip . sed -i -e 's| $(MAKE) $(top_srcdir)/26104-700_ANSI_C_source_code.zip||' Makefile.in - ./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --disable-static + ./configure --prefix=/usr make make DESTDIR=$PKG install

1 0

ports/contrib (3.2): amrwb: add missing dep: unzip
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit ee9f52255a70bed3d3c6f117512bb3ff69f5c675 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 16:01:49 2016 +1000 amrwb: add missing dep: unzip diff --git a/amrwb/Pkgfile b/amrwb/Pkgfile index e802449..b4b754d 100644 --- a/amrwb/Pkgfile +++ b/amrwb/Pkgfile @@ -2,10 +2,11 @@ # URL: http://www.penguin.cz/~utx/amr # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Danny Rawlins, crux at romster dot me +# Depends on: unzip name=amrwb version=7.0.0.4 -release=1 +release=2 source=(http://ftp.penguin.cz/pub/users/utx/amr/$name-$version.tar.bz2 http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip) @@ -14,10 +15,7 @@ build() { cp $SRC/26204-700_ANSI-C_source_code.zip . sed -i -e 's| $(MAKE) $(top_srcdir)/26204-700_ANSI-C_source_code.zip||' Makefile.in - ./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --disable-static + ./configure --prefix=/usr make make DESTDIR=$PKG install

1 0

ports/contrib (3.2): pycparser: update footprint
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit ae0bd5f4cf31c77141cba670dc0a9f089ad56822 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 17:01:37 2016 +1000 pycparser: update footprint diff --git a/pycparser/.footprint b/pycparser/.footprint index 9d2d02d..7f6877b 100644 --- a/pycparser/.footprint +++ b/pycparser/.footprint @@ -17,7 +17,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pycparser/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/_build_tables.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/_build_tables.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/_build_tables.pyo --rw-rw-rw- root/root usr/lib/python2.7/site-packages/pycparser/_c_ast.cfg +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/pycparser/_c_ast.cfg -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/ast_transforms.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/ast_transforms.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pycparser/ast_transforms.pyo

1 0

ports/contrib (3.2): transcode: fix for ffmpeg
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit ee57e5b418c97cbdfc68cddf09e16a3fb0220f3c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 16:55:55 2016 +1000 transcode: fix for ffmpeg diff --git a/transcode/.footprint b/transcode/.footprint index e43d936..02c0ff1 100644 --- a/transcode/.footprint +++ b/transcode/.footprint @@ -244,25 +244,26 @@ lrwxrwxrwx root/root usr/lib/transcode/export_xvid.so -> export_xvid4.so -rwxr-xr-x root/root usr/lib/transcode/import_yuv4mpeg.so -rwxr-xr-x root/root usr/lib/transcode/parse_csv.awk -rw-r--r-- root/root usr/lib/transcode/xvid4.cfg -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/avifix.1.gz --rw-r--r-- root/root usr/man/man1/aviindex.1.gz --rw-r--r-- root/root usr/man/man1/avimerge.1.gz --rw-r--r-- root/root usr/man/man1/avisplit.1.gz --rw-r--r-- root/root usr/man/man1/avisync.1.gz --rw-r--r-- root/root usr/man/man1/tccat.1.gz --rw-r--r-- root/root usr/man/man1/tcdecode.1.gz --rw-r--r-- root/root usr/man/man1/tcdemux.1.gz --rw-r--r-- root/root usr/man/man1/tcexport.1.gz --rw-r--r-- root/root usr/man/man1/tcextract.1.gz --rw-r--r-- root/root usr/man/man1/tcmodchain.1.gz --rw-r--r-- root/root usr/man/man1/tcmodinfo.1.gz --rw-r--r-- root/root usr/man/man1/tcprobe.1.gz --rw-r--r-- root/root usr/man/man1/tcpvmexportd.1.gz --rw-r--r-- root/root usr/man/man1/tcscan.1.gz --rw-r--r-- root/root usr/man/man1/tcxmlcheck.1.gz --rw-r--r-- root/root usr/man/man1/transcode.1.gz --rw-r--r-- root/root usr/man/man1/transcode_export.1.gz --rw-r--r-- root/root usr/man/man1/transcode_filter.1.gz --rw-r--r-- root/root usr/man/man1/transcode_import.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/avifix.1.gz +-rw-r--r-- root/root usr/share/man/man1/aviindex.1.gz +-rw-r--r-- root/root usr/share/man/man1/avimerge.1.gz +-rw-r--r-- root/root usr/share/man/man1/avisplit.1.gz +-rw-r--r-- root/root usr/share/man/man1/avisync.1.gz +-rw-r--r-- root/root usr/share/man/man1/tccat.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcdecode.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcdemux.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcexport.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcextract.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcmodchain.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcmodinfo.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcprobe.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcpvmexportd.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcscan.1.gz +-rw-r--r-- root/root usr/share/man/man1/tcxmlcheck.1.gz +-rw-r--r-- root/root usr/share/man/man1/transcode.1.gz +-rw-r--r-- root/root usr/share/man/man1/transcode_export.1.gz +-rw-r--r-- root/root usr/share/man/man1/transcode_filter.1.gz +-rw-r--r-- root/root usr/share/man/man1/transcode_import.1.gz diff --git a/transcode/.md5sum b/transcode/.md5sum index 22162d7..b0fa602 100644 --- a/transcode/.md5sum +++ b/transcode/.md5sum @@ -3,9 +3,12 @@ a8d4d78e3311f576c7da27f2657358fd subtitleripper-0.3.4-linkingorder.patch f9b367044568d0ef4612770969c93e14 subtitleripper-0.3.4-respect-ldflags.patch 3cf2826df9a1a238c255a8525a63b435 transcode-1.1.7-ffmpeg-0.10.patch e78dfec264287e3ef09fae07e3477e5c transcode-1.1.7-ffmpeg-0.11.patch +28da283b40109aa9add9f58d41472ed3 transcode-1.1.7-ffmpeg-2.4.patch 69f3db45ae31213ea94a5dc0dda677bd transcode-1.1.7-ffmpeg.patch 951bff4b2dda3c8a5caf24e63c70c1aa transcode-1.1.7-ffmpeg2.patch -c764ee001be39d9af05ff3306389522f transcode-1.1.7-libav-9.patch +b5472b3f0d2536bcd75efa777262dc72 transcode-1.1.7-ffmpeg29.patch +8bf570239d9aad287f3254d350e1f98a transcode-1.1.7-libav-9.patch db152c456e768b06fec47f0b4b7a60ff transcode-1.1.7-preset-force.patch 5fd43f03549c97651dcc38a6f504de1e transcode-1.1.7-preset-free.patch 9bb25a796a8591fb764de46ee87ce505 transcode-1.1.7.tar.bz2 +962d78f070d604931b6229f193c77c91 transcode-ffmpeg3.patch diff --git a/transcode/Pkgfile b/transcode/Pkgfile index 67bff1d..66e39c6 100644 --- a/transcode/Pkgfile +++ b/transcode/Pkgfile @@ -2,13 +2,15 @@ # URL: http://tcforge.berlios.de/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Martin Opel, mo at obbl-net dot de -# Depends on: imagemagick liba52 libdvdread libmpeg2 lzo mjpegtools +# Depends on: imagemagick liba52 libdvdread libmpeg2 mjpegtools name=transcode version=1.1.7 -release=3 +release=4 source=(https://bitbucket.org/france/transcode-tcforge/downloads/$name-$ver… http://downloads.sourceforge.net/project/subtitleripper/subtitleripper/subt… + subtitleripper-0.3.4-linkingorder.patch + subtitleripper-0.3.4-respect-ldflags.patch transcode-1.1.7-ffmpeg.patch transcode-1.1.7-ffmpeg-0.10.patch transcode-1.1.7-ffmpeg-0.11.patch @@ -16,11 +18,13 @@ source=(https://bitbucket.org/france/transcode-tcforge/downloads/$name-$ver…. transcode-1.1.7-libav-9.patch transcode-1.1.7-preset-force.patch transcode-1.1.7-ffmpeg2.patch - subtitleripper-0.3.4-linkingorder.patch - subtitleripper-0.3.4-respect-ldflags.patch) + transcode-1.1.7-ffmpeg-2.4.patch + transcode-1.1.7-ffmpeg29.patch + transcode-ffmpeg3.patch) build() { cd $name-$version + CFLAGS+=' -pthread' patch -p 0 -i $SRC/transcode-1.1.7-ffmpeg.patch @@ -30,12 +34,16 @@ build() { patch -p 0 -i $SRC/transcode-1.1.7-libav-9.patch patch -p 1 -i $SRC/transcode-1.1.7-preset-force.patch patch -p 1 -i $SRC/transcode-1.1.7-ffmpeg2.patch - sed -i -e 's|freetype/ftglyph.h|freetype2/ftglyph.h|' filter/subtitler/load_font.c - libtoolize + patch -p 1 -i $SRC/transcode-1.1.7-ffmpeg-2.4.patch + patch -p 1 -i $SRC/transcode-1.1.7-ffmpeg29.patch + patch -p 1 -i $SRC/transcode-ffmpeg3.patch + + sed \ + -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' \ + -i filter/subtitler/load_font.c ./configure \ --prefix=/usr \ - --mandir=/usr/man \ --disable-dependency-tracking \ --enable-alsa \ --enable-a52 \ @@ -60,7 +68,8 @@ build() { make make DESTDIR=$PKG install - rm -r $PKG/usr/share + + rm -r $PKG/usr/share/doc # Subtitle support cd ../subtitleripper @@ -74,5 +83,7 @@ build() { -i Makefile make - install -m 0755 -D pgm2txt srttool subtitle2pgm subtitle2vobsub vobsub2pgm $PKG/usr/bin + install -m 0755 -t $PKG/usr/bin \ + pgm2txt srttool subtitle2pgm \ + subtitle2vobsub vobsub2pgm } diff --git a/transcode/transcode-1.1.7-ffmpeg-2.4.patch b/transcode/transcode-1.1.7-ffmpeg-2.4.patch new file mode 100644 index 0000000..da178c2 --- /dev/null +++ b/transcode/transcode-1.1.7-ffmpeg-2.4.patch @@ -0,0 +1,13 @@ +diff --git a/import/probe_ffmpeg.c b/import/probe_ffmpeg.c +index 96d3d49..8e61c51 100644 +--- a/import/probe_ffmpeg.c ++++ b/import/probe_ffmpeg.c +@@ -120,7 +120,7 @@ void probe_ffmpeg(info_t *ipipe) + + translate_info(lavf_dmx_context, ipipe->probe_info); + +- av_close_input_file(lavf_dmx_context); ++ avformat_close_input(&lavf_dmx_context); + return; + } + diff --git a/transcode/transcode-1.1.7-ffmpeg29.patch b/transcode/transcode-1.1.7-ffmpeg29.patch new file mode 100644 index 0000000..7901fc3 --- /dev/null +++ b/transcode/transcode-1.1.7-ffmpeg29.patch @@ -0,0 +1,352 @@ +Index: transcode-1.1.7/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.7.orig/encode/encode_lavc.c ++++ transcode-1.1.7/encode/encode_lavc.c +@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + } + +@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf + IMG_YUV_DEFAULT, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV422P, +@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL + IMG_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV422P, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + + } +@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri + case CODEC_YUV: + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->tc_pix_fmt = TC_CODEC_YUV422P; +- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; ++ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; + pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; + } else { + pd->tc_pix_fmt = TC_CODEC_YUV420P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_yuv420p; + } + break; + case CODEC_YUV422: + pd->tc_pix_fmt = TC_CODEC_YUV422P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ422P +- : PIX_FMT_YUV422P; ++ ? AV_PIX_FMT_YUVJ422P ++ : AV_PIX_FMT_YUV422P; + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; + } else { +@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri + case CODEC_RGB: + pd->tc_pix_fmt = TC_CODEC_RGB; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) +- ? PIX_FMT_YUV422P ++ ? AV_PIX_FMT_YUV422P + : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_rgb24; + break; + default: +@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns + /* FIXME: move into core? */ + TC_INIT_LIBAVCODEC; + +- avcodec_get_frame_defaults(&pd->ff_venc_frame); ++ av_frame_unref(&pd->ff_venc_frame); + /* + * auxiliary config data needs to be blanked too + * before any other operation +@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule + vframe_list_t *outframe) + { + TCLavcPrivateData *pd = NULL; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + TC_MODULE_SELF_CHECK(self, "encode_video"); + +@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule + + pd->pre_encode_video(pd, inframe); + ++ av_init_packet(&pkt); ++ pkt.data = outframe->video_buf; ++ pkt.size = inframe->video_size; ++ + TC_LOCK_LIBAVCODEC; +- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, +- outframe->video_buf, +- inframe->video_size, +- &pd->ff_venc_frame); ++ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, ++ &pd->ff_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ outframe->video_len = ret ? ret : pkt.size; + + if (outframe->video_len < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%i)", +Index: transcode-1.1.7/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/export/export_ffmpeg.c ++++ transcode-1.1.7/export/export_ffmpeg.c +@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c + for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ + /* GLUE: +if */ + if (type == AVMEDIA_TYPE_VIDEO) { +- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); +- if(o2) +- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); ++ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); ++ if(o) ++ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); + /* GLUE: +if */ + } + } +@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c + if(opt[0] == 'a') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); + else */ if(opt[0] == 'v') +- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); ++ { ++ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); ++ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); ++ } + /* GLUE: disabling + else if(opt[0] == 's') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); +@@ -487,10 +490,10 @@ MOD_init + } + + lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); +- lavc_venc_frame = avcodec_alloc_frame(); ++ lavc_venc_frame = av_frame_alloc(); + +- lavc_convert_frame= avcodec_alloc_frame(); +- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); ++ lavc_convert_frame= av_frame_alloc(); ++ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); + enc_buffer = tc_malloc(size); + + if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { +@@ -1114,7 +1117,7 @@ MOD_init + lavc_venc_context->prediction_method = lavc_param_prediction_method; + + if(is_huffyuv) +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + else + { + switch(pix_fmt) +@@ -1123,18 +1126,18 @@ MOD_init + case CODEC_RGB: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; + break; + } + + case CODEC_YUV422: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + break; + } + +@@ -1596,6 +1599,8 @@ MOD_encode + + int out_size; + const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + if (param->flag == TC_VIDEO) { + +@@ -1620,7 +1625,7 @@ MOD_encode + YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, + lavc_venc_context->width, lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV422P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV422P, lavc_venc_context->width, + lavc_venc_context->height); + /* FIXME: can't use tcv_convert (see decode_lavc.c) */ + ac_imgconvert(src, IMG_YUV_DEFAULT, +@@ -1650,7 +1655,7 @@ MOD_encode + lavc_venc_context->width, + lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(src, IMG_YUV422P, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1661,7 +1666,7 @@ MOD_encode + + case CODEC_RGB: + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1674,13 +1679,17 @@ MOD_encode + return TC_EXPORT_ERROR; + } + ++ av_init_packet(&pkt); ++ pkt.data = enc_buffer; ++ pkt.size = size; + + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_video(lavc_venc_context, +- enc_buffer, size, +- lavc_venc_frame); ++ ret = avcodec_encode_video2(lavc_venc_context, &pkt, ++ lavc_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; + ++ out_size = ret ? ret : pkt.size; ++ + if (out_size < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); + return TC_EXPORT_ERROR; +Index: transcode-1.1.7/import/decode_lavc.c +=================================================================== +--- transcode-1.1.7.orig/import/decode_lavc.c ++++ transcode-1.1.7/import/decode_lavc.c +@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode) + + // Convert avcodec image to the requested YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + // Remove "dead space" at right edge of planes, if any + if (picture.linesize[0] != lavc_dec_context->width) { + int y; +@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode) + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode) + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode) + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +Index: transcode-1.1.7/import/import_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/import/import_ffmpeg.c ++++ transcode-1.1.7/import/import_ffmpeg.c +@@ -661,8 +661,8 @@ retry: + + // Convert avcodec image to our internal YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + src_fmt = IMG_YUV420P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -693,7 +693,7 @@ retry: + } + break; + +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + src_fmt = IMG_YUV411P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -721,8 +721,8 @@ retry: + } + break; + +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + src_fmt = IMG_YUV422P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -750,8 +750,8 @@ retry: + } + break; + +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + src_fmt = IMG_YUV444P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); diff --git a/transcode/transcode-1.1.7-libav-9.patch b/transcode/transcode-1.1.7-libav-9.patch index 9f2d235..3989d3d 100644 --- a/transcode/transcode-1.1.7-libav-9.patch +++ b/transcode/transcode-1.1.7-libav-9.patch @@ -1,5 +1,5 @@ ---- ./import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 -+++ ./import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 +--- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 ++++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 @@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) return; } @@ -9,8 +9,8 @@ if (ret < 0) { tc_log_error(__FILE__, "unable to fetch informations from '%s'" " (libavformat failure)", ---- ./import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 -+++ ./import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 +--- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 ++++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 @@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) // Set these to the expected values so that ffmpeg's decoder can diff --git a/transcode/transcode-ffmpeg3.patch b/transcode/transcode-ffmpeg3.patch new file mode 100644 index 0000000..efc928f --- /dev/null +++ b/transcode/transcode-ffmpeg3.patch @@ -0,0 +1,213 @@ +--- transcode-1.1.7/export/aud_aux.c.orig 2016-02-16 23:38:40.162690789 +0000 ++++ transcode-1.1.7/export/aud_aux.c 2016-02-16 23:40:50.335488439 +0000 +@@ -326,10 +326,10 @@ + + switch (o_codec) { + case 0x50: +- codeid = CODEC_ID_MP2; ++ codeid = AV_CODEC_ID_MP2; + break; + case 0x2000: +- codeid = CODEC_ID_AC3; ++ codeid = AV_CODEC_ID_AC3; + break; + default: + tc_warn("cannot init ffmpeg with %x", o_codec); +@@ -363,7 +363,7 @@ + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); ++ (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3"); + return(TC_EXPORT_ERROR); + } + +--- transcode-1.1.7/import/import_ffmpeg.c.orig 2016-02-16 23:52:36.192589648 +0000 ++++ transcode-1.1.7/import/import_ffmpeg.c 2016-02-16 23:54:38.728757498 +0000 +@@ -59,51 +59,51 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_H264, TC_CODEC_H264, "h264", ++ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", + {"H264", "h264", "X264", "x264", "avc1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", ++ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", + {"ASV1", ""}}, +- {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", ++ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", + {"ASV2", ""}}, +- {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", ++ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", + {"FFV1", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", + {"I420", "IYUV", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", + {"Y42B", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; + +@@ -324,13 +324,13 @@ + // XXX: some codecs need extra data + switch (codec->id) + { +- case CODEC_ID_MJPEG: extra_data_size = 28; break; +- case CODEC_ID_LJPEG: extra_data_size = 28; break; +- case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; +- case CODEC_ID_ASV1: extra_data_size = 8; break; +- case CODEC_ID_ASV2: extra_data_size = 8; break; +- case CODEC_ID_WMV1: extra_data_size = 4; break; +- case CODEC_ID_WMV2: extra_data_size = 4; break; ++ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; ++ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; ++ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; ++ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; ++ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; + default: extra_data_size = 0; break; + } + +@@ -360,7 +360,7 @@ + frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + break; +@@ -434,7 +434,7 @@ + } + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + +@@ -504,13 +504,13 @@ + int bkey = 0; + + // check for keyframes +- if (codec->id == CODEC_ID_MSMPEG4V3) { ++ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { + if (divx3_is_key(buffer)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MPEG4) { ++ else if (codec->id == AV_CODEC_ID_MPEG4) { + if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MJPEG) { ++ else if (codec->id == AV_CODEC_ID_MJPEG) { + bkey = 1; + } + +--- transcode-1.1.7/import/decode_lavc.c.orig 2016-02-16 23:56:35.488282034 +0000 ++++ transcode-1.1.7/import/decode_lavc.c 2016-02-16 23:56:55.201535074 +0000 +@@ -58,37 +58,37 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; +

1 0

ports/compat-32 (3.2): expat-32: 2.1.1 -> 2.2.0
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit e74acf52d90acb050292bed4e2e68ef729aab266 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 15:56:12 2016 +1000 expat-32: 2.1.1 -> 2.2.0 diff --git a/expat-32/.md5sum b/expat-32/.md5sum index bf1f124..377dcf4 100644 --- a/expat-32/.md5sum +++ b/expat-32/.md5sum @@ -1 +1 @@ -7380a64a8e3a9d66a9887b01d0d7ea81 expat-2.1.1.tar.bz2 +2f47841c829facb346eb6e3fab5212e2 expat-2.2.0.tar.bz2 diff --git a/expat-32/Pkgfile b/expat-32/Pkgfile index 0e0ea93..96bc3b2 100644 --- a/expat-32/Pkgfile +++ b/expat-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: expat name=expat-32 -version=2.1.1 +version=2.2.0 release=1 source=(http://download.sourceforge.net/expat/expat-$version.tar.bz2)

1 0

ports/compat-32 (3.2): libgmp-32: 6.1.0 -> 6.1.1
by crux＠crux.nu 26 Jun '16

26 Jun '16

commit ffee1b1e3cf6837b95d8ed711cc8cd4936cc0693 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 26 15:55:18 2016 +1000 libgmp-32: 6.1.0 -> 6.1.1 diff --git a/libgmp-32/.footprint b/libgmp-32/.footprint index 1a66842..d49f53a 100644 --- a/libgmp-32/.footprint +++ b/libgmp-32/.footprint @@ -4,11 +4,11 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgmp.a -rwxr-xr-x root/root usr/lib32/libgmp.la -lrwxrwxrwx root/root usr/lib32/libgmp.so -> libgmp.so.10.3.0 -lrwxrwxrwx root/root usr/lib32/libgmp.so.10 -> libgmp.so.10.3.0 --rwxr-xr-x root/root usr/lib32/libgmp.so.10.3.0 +lrwxrwxrwx root/root usr/lib32/libgmp.so -> libgmp.so.10.3.1 +lrwxrwxrwx root/root usr/lib32/libgmp.so.10 -> libgmp.so.10.3.1 +-rwxr-xr-x root/root usr/lib32/libgmp.so.10.3.1 -rw-r--r-- root/root usr/lib32/libgmpxx.a -rwxr-xr-x root/root usr/lib32/libgmpxx.la -lrwxrwxrwx root/root usr/lib32/libgmpxx.so -> libgmpxx.so.4.5.0 -lrwxrwxrwx root/root usr/lib32/libgmpxx.so.4 -> libgmpxx.so.4.5.0 --rwxr-xr-x root/root usr/lib32/libgmpxx.so.4.5.0 +lrwxrwxrwx root/root usr/lib32/libgmpxx.so -> libgmpxx.so.4.5.1 +lrwxrwxrwx root/root usr/lib32/libgmpxx.so.4 -> libgmpxx.so.4.5.1 +-rwxr-xr-x root/root usr/lib32/libgmpxx.so.4.5.1 diff --git a/libgmp-32/.md5sum b/libgmp-32/.md5sum index e44cd1b..32d0244 100644 --- a/libgmp-32/.md5sum +++ b/libgmp-32/.md5sum @@ -1 +1 @@ -a9868ef2556ad6a2909babcd1428f3c7 gmp-6.1.0.tar.xz +e70e183609244a332d80529e7e155a35 gmp-6.1.1.tar.xz diff --git a/libgmp-32/Pkgfile b/libgmp-32/Pkgfile index 37a483a..b593bba 100644 --- a/libgmp-32/Pkgfile +++ b/libgmp-32/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu name=libgmp-32 -version=6.1.0 -release=2 +version=6.1.1 +release=1 source=(http://gmplib.org/download/gmp/gmp-$version.tar.xz) build() {

1 0