November 2022 - crux-commits

ports/contrib (3.7): glibmm: 2.64.5 -> 2.66.5
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 62672ea56dd6e61955d844d0f94b61ab62e11442 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 18:16:18 2022 +0000 glibmm: 2.64.5 -> 2.66.5 diff --git a/glibmm/.signature b/glibmm/.signature index a141d6642..ff13fd92d 100644 --- a/glibmm/.signature +++ b/glibmm/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+MPJllnkuoUk6oqc/IDv6/4fYpIEhBWmPKFgvaEomt9y3KITVzierYol5dzZqFGQgVDE6xjFvhf4EUMbjzVSg0= -SHA256 (Pkgfile) = 2f2bb6d55418000c15e2206dcede2aaf80a3372c550e7039206d35761bd0c224 +RWSagIOpLGJF3wZp2UHBnoSndebM3t8ed3SdhC3xi4gNB12qHiAVTNDDQa6rST4/2VcsCN/WqNnvgH7coCNwL/bGfVB99EjE9gQ= +SHA256 (Pkgfile) = 2bd33acb8b4422fe61348f24c96aa1f6902a8682f4f0feea45efaaddd16be054 SHA256 (.footprint) = ba1cfb86a405f0fb422e2aa75672eaf355004648f22c853fde6f695873961c3f -SHA256 (glibmm-2.64.5.tar.xz) = 508fc86e2c9141198aa16c225b16fd6b911917c0d3817602652844d0973ea386 +SHA256 (glibmm-2.66.5.tar.xz) = 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 diff --git a/glibmm/Pkgfile b/glibmm/Pkgfile index 9e8096886..a1228f4d5 100644 --- a/glibmm/Pkgfile +++ b/glibmm/Pkgfile @@ -1,17 +1,20 @@ # Description: C++ interface for the popular glib library. # URL: https://www.gtkmm.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gtk libsigc++2 +# Depends on: glib libsigc++2 name=glibmm -version=2.64.5 +version=2.66.5 release=1 source=(https://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$… build() { meson setup build $name-$version \ --prefix=/usr \ - --buildtype=plain + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true meson compile -C build -j ${JOBS-1} DESTDIR=$PKG meson install -C build

1 0

ports/contrib (3.7): libsigc++2: 2.10.7 -> 2.10.8
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit b405e863bcdc6032187b9fba42ff3bec7bddb89d Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 18:14:12 2022 +0000 libsigc++2: 2.10.7 -> 2.10.8 diff --git a/libsigc++2/.signature b/libsigc++2/.signature index 55114c42a..f23e2b92e 100644 --- a/libsigc++2/.signature +++ b/libsigc++2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zsSWCajjQfKCfpzVntSA73bVnFOPy/IlokHvqT3Kb9nPP9QqsCXr77v5g0cfvqQ5ODREraZv97SkwPXP1rr9QM= -SHA256 (Pkgfile) = ecaf3a341522053007caa8471852047e42d31ba878f52157ac1a86db0a3ba7ff +RWSagIOpLGJF3zYE5TsKUriPDmSxmv/MEgv/IqkwRXRirTvmsGVOWhhOtzN3ODv7NCtyzLKV0+MSdcFdXU5I3ioXEdneYXYJYgk= +SHA256 (Pkgfile) = f9a4b229e7af832299211a5da73688437d860f6dba91ee4a1f126a3a4c92fcd5 SHA256 (.footprint) = 8fa27edaee2e26de3ca61cb2b9ffd7539003498956ba2a18c6e99b17927885e6 -SHA256 (libsigc++-2.10.7.tar.xz) = d082a2ce72c750f66b1a415abe3e852df2eae1e8af53010f4ac2ea261a478832 +SHA256 (libsigc++-2.10.8.tar.xz) = 235a40bec7346c7b82b6a8caae0456353dc06e71f14bc414bcc858af1838719a diff --git a/libsigc++2/Pkgfile b/libsigc++2/Pkgfile index 3bbf5c2cc..497d910de 100644 --- a/libsigc++2/Pkgfile +++ b/libsigc++2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mm-common name=libsigc++2 -version=2.10.7 +version=2.10.8 release=1 source=(https://download.gnome.org/sources/libsigc++/${version%.*}/libsigc+…

1 0

ports/contrib (3.7): pangomm: 2.42.2 -> 2.46.3
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 25f2882fc76b15c90e86550e797726b4a7c3fb80 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 18:13:12 2022 +0000 pangomm: 2.42.2 -> 2.46.3 diff --git a/pangomm/.signature b/pangomm/.signature index e0c5af01d..655b3cc0c 100644 --- a/pangomm/.signature +++ b/pangomm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/j+QYmePIGdc6YFalpoWFKyY0WgrzIBvSBEy2g5Lvz4zuTltL1piuKpgxksG4PEcWzqKTTmCWE/QqlcCiSzygM= -SHA256 (Pkgfile) = b5404557b6caf4be95611e15c6a835293cd2e91f4d44437e32e2191d32c7479f +RWSagIOpLGJF3+hrM4SmDjPNNjfS87+YbjVLlsDCuM3Rmq/UmaOtyyxeVBhZW2vky8PSHWbPN0P+904NRjSNP1+HEI4e9g3GFA4= +SHA256 (Pkgfile) = a10d40d261c061c70460a0dfaf7570ed1289fae635eb9506c971273e1671f869 SHA256 (.footprint) = d0102e51dc80e3c33ebd4356adc3aac9b6fdc1bed08bf2d2f8ec57ec496994f6 -SHA256 (pangomm-2.42.2.tar.xz) = 1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a +SHA256 (pangomm-2.46.3.tar.xz) = 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 SHA256 (pango.patch) = 9089d4c0ea2900371f3ec2f0641df02de78f1deef3cc773062d7e1f31c4fe660 diff --git a/pangomm/Pkgfile b/pangomm/Pkgfile index 52f8c46bf..1e1b406c7 100644 --- a/pangomm/Pkgfile +++ b/pangomm/Pkgfile @@ -1,11 +1,11 @@ # Description: C++ interface to pango. # URL: https://gitlab.gnome.org/GNOME/pangomm # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cairomm12 glibmm +# Depends on: cairomm12 glibmm pango name=pangomm -version=2.42.2 -release=2 +version=2.46.3 +release=1 source=(https://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$… pango.patch)

1 0

ports/contrib (3.7): libquicktime: dropped
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 21624d9adfd40a678e08c9b9e6af7b25e160c3b5 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 17:52:55 2022 +0000 libquicktime: dropped diff --git a/libquicktime/.footprint b/libquicktime/.footprint deleted file mode 100644 index 46b07a1f4..000000000 --- a/libquicktime/.footprint +++ /dev/null @@ -1,59 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/libquicktime_config --rwxr-xr-x root/root usr/bin/lqt_transcode --rwxr-xr-x root/root usr/bin/lqtplay --rwxr-xr-x root/root usr/bin/lqtremux --rwxr-xr-x root/root usr/bin/qt2text --rwxr-xr-x root/root usr/bin/qtdechunk --rwxr-xr-x root/root usr/bin/qtdump --rwxr-xr-x root/root usr/bin/qtinfo --rwxr-xr-x root/root usr/bin/qtrechunk --rwxr-xr-x root/root usr/bin/qtstreamize --rwxr-xr-x root/root usr/bin/qtyuv4toyuv -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/lqt/ --rw-r--r-- root/root usr/include/lqt/colormodels.h --rw-r--r-- root/root usr/include/lqt/compression.h --rw-r--r-- root/root usr/include/lqt/lqt.h --rw-r--r-- root/root usr/include/lqt/lqt_atoms.h --rw-r--r-- root/root usr/include/lqt/lqt_codecinfo.h --rw-r--r-- root/root usr/include/lqt/lqt_qtvr.h --rw-r--r-- root/root usr/include/lqt/lqt_version.h --rw-r--r-- root/root usr/include/lqt/quicktime.h -drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libquicktime.la -lrwxrwxrwx root/root usr/lib/libquicktime.so -> libquicktime.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libquicktime.so.0 -> libquicktime.so.0.0.0 --rwxr-xr-x root/root usr/lib/libquicktime.so.0.0.0 -drwxr-xr-x root/root usr/lib/libquicktime/ --rwxr-xr-x root/root usr/lib/libquicktime/lqt_audiocodec.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_audiocodec.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_dv.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_dv.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_faac.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_faac.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_ffmpeg.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_ffmpeg.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_lame.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_lame.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_mjpeg.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_mjpeg.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_png.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_png.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_rtjpeg.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_rtjpeg.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_schroedinger.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_schroedinger.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_videocodec.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_videocodec.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_vorbis.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_vorbis.so --rwxr-xr-x root/root usr/lib/libquicktime/lqt_x264.la --rwxr-xr-x root/root usr/lib/libquicktime/lqt_x264.so -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libquicktime.pc -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/lqtplay.1.gz diff --git a/libquicktime/.signature b/libquicktime/.signature deleted file mode 100644 index b850575d1..000000000 --- a/libquicktime/.signature +++ /dev/null @@ -1,9 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37BEgj5eSEImOULjaWvzV1fPTbm05adCwoEO0lfroKpEkNlb09WtWEZqPXSH157oGiYdai/2BFMjVEkMK8JizwE= -SHA256 (Pkgfile) = 586ba27e5945e755bb9235845994493d9976d9920dcdfe23f5347186358143e6 -SHA256 (.footprint) = 8be888c7e330c47c66aeb20b894ee80c54f3b6682c727fc80de471602242912f -SHA256 (libquicktime-1.2.4.tar.gz) = 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 -SHA256 (CVE-2016-2399.patch) = 006c6be761075ca25217fe510e1ec7cfbb6262c3d758c1bd629719072ddb0935 -SHA256 (libquicktime-1.2.4-ffmpeg2.patch) = 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93 -SHA256 (libquicktime-1.2.4-ffmpeg29.patch) = c3a8dfb6bfb69c2b54aeafe3306a8af1fff5a3a06fd05b28725d3ea7688ce2cd -SHA256 (libquicktime-1.2.4-ffmpeg4.patch) = d4582dc2ed389acd01080690a95643277e43955adcb4058132506c5b437d044f diff --git a/libquicktime/CVE-2016-2399.patch b/libquicktime/CVE-2016-2399.patch deleted file mode 100644 index a1737c0dc..000000000 --- a/libquicktime/CVE-2016-2399.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399 - -diff --git a/src/util.c b/src/util.c -index d8dc3c3..9422fc5 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file) - - void quicktime_read_pascal(quicktime_t *file, char *data) - { -- char len = quicktime_read_char(file); -- quicktime_read_data(file, (uint8_t*)data, len); -- data[(int)len] = 0; -+ int len = quicktime_read_char(file); -+ if ((len > 0) && (len < 256)) { -+ /* data[] is expected to be 256 bytes long */ -+ quicktime_read_data(file, (uint8_t*)data, len); -+ data[len] = 0; -+ } else { -+ data[0] = 0; -+ } - } - - void quicktime_write_pascal(quicktime_t *file, char *data) diff --git a/libquicktime/Pkgfile b/libquicktime/Pkgfile deleted file mode 100644 index e024de66c..000000000 --- a/libquicktime/Pkgfile +++ /dev/null @@ -1,37 +0,0 @@ -# Description: A library based on quicktime4linux with extensions. -# URL: http://libquicktime.sourceforge.net/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: faac faad2 ffmpeg gtk lame libdv libvorbis schroedinger util-linux x264 xorg-libxaw - -name=libquicktime -version=1.2.4 -release=4 -source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz - CVE-2016-2399.patch - libquicktime-1.2.4-ffmpeg2.patch - libquicktime-1.2.4-ffmpeg29.patch - libquicktime-1.2.4-ffmpeg4.patch) - -build() { - cd $name-$version - - patch -p 1 -i $SRC/CVE-2016-2399.patch - patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg2.patch - patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg29.patch - patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg4.patch - for FILE in lqt_ffmpeg.c video.c audio.c ; do - sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${FILE}" - done - - ./configure \ - --prefix=/usr \ - --enable-gpl \ - --disable-nls \ - --with-libdv \ - --with-ffmpeg \ - --with-x264 \ - --without-doxygen - - make - make DESTDIR=$PKG install -} diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libquicktime/libquicktime-1.2.4-ffmpeg2.patch deleted file mode 100644 index 7add44220..000000000 --- a/libquicktime/libquicktime-1.2.4-ffmpeg2.patch +++ /dev/null @@ -1,98 +0,0 @@ -Extracted from upstream CVS. -https://bugs.gentoo.org/show_bug.cgi?id=476498 - -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -101,6 +101,17 @@ typedef struct - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg29.patch b/libquicktime/libquicktime-1.2.4-ffmpeg29.patch deleted file mode 100644 index 96a323aa8..000000000 --- a/libquicktime/libquicktime-1.2.4-ffmpeg29.patch +++ /dev/null @@ -1,287 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co - /* First we try codec-specific colormodel matching. */ - if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libquicktime/libquicktime-1.2.4-ffmpeg4.patch deleted file mode 100644 index eb196ea16..000000000 --- a/libquicktime/libquicktime-1.2.4-ffmpeg4.patch +++ /dev/null @@ -1,342 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = codec->chunk_buffer; -- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - frame_bytes = avcodec_decode_audio4(codec->avctx, &f, -@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - codec->chunk_buffer, -- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); - if(frame_bytes < 0) - { - lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); -@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi - return 0; - } - -- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) -+ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) - { -- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; - codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); - } - memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, -- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - num_samples = mph.samples_per_frame; - codec->bytes_in_chunk_buffer = mph.frame_bytes; - } -@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi - { - - -- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size -+ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size - because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ -@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = &codec->chunk_buffer[bytes_used]; -- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - -@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - &codec->chunk_buffer[bytes_used], -- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - #endif - if(frame_bytes < 0) - { -@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi - } - } - -- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ -+ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ - - if(codec->bytes_in_chunk_buffer < 0) - codec->bytes_in_chunk_buffer = 0; -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -124,16 +124,6 @@ typedef struct - } - - --enum_t me_method[] = -- { -- { "Zero", ME_ZERO }, -- { "Phods", ME_PHODS }, -- { "Log", ME_LOG }, -- { "X1", ME_X1 }, -- { "Epzs", ME_EPZS }, -- { "Full", ME_FULL } -- }; -- - enum_t prediction_method[] = - { - { "Left", FF_PRED_LEFT }, -@@ -163,15 +153,6 @@ enum_t mb_decision[] = - { "Rate distoration", FF_MB_DECISION_RD } - }; - --enum_t coder_type[] = -- { -- { "VLC", FF_CODER_TYPE_VLC }, -- { "Arithmetic", FF_CODER_TYPE_AC }, -- { "Raw", FF_CODER_TYPE_RAW }, -- { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, -- }; -- - #define PARAM_ENUM(name, var, arr) \ - if(!strcasecmp(key, name)) \ - { \ -@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); -- PARAM_ENUM("ff_me_method",me_method,me_method); -+ PARAM_DICT_INT("ff_me_method","motion-est"); - PARAM_INT("ff_gop_size",gop_size); - PARAM_FLOAT("ff_qcompress",qcompress); - PARAM_FLOAT("ff_qblur",qblur); -@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_rc_min_rate",rc_min_rate); - PARAM_INT("ff_rc_max_rate",rc_max_rate); - PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); -- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); - PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); - PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); -- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); -+ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); - PARAM_FLOAT("ff_lumi_masking",lumi_masking); - PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); - PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); -@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_range",me_range); - PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); - PARAM_INT("ff_scenechange_threshold",scenechange_threshold); -- PARAM_QP2LAMBDA("ff_lmin", lmin); -- PARAM_QP2LAMBDA("ff_lmax", lmax); -+ PARAM_DICT_INT("ff_lmin", "lmin"); -+ PARAM_DICT_INT("ff_lmax", "lmax"); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); - -@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - #endif - - PARAM_INT("ff_thread_count",thread_count); -- PARAM_INT("ff_me_threshold",me_threshold); -- PARAM_INT("ff_mb_threshold",mb_threshold); - PARAM_INT("ff_nsse_weight",nsse_weight); -- PARAM_FLOAT("ff_border_masking",border_masking); -+ PARAM_DICT_INT("ff_border_masking","border_mask"); - PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); - PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); -- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); -- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); -- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); -+ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); -+ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); -+ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); -+ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); -+ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused -- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); -- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); -+ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); -+ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); - #else - PARAM_INT("ff_trellis",trellis); - #endif -- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); -- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); -+ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); -+ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused - - #if LIBAVCODEC_VERSION_MAJOR >= 55 -@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); - PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); - #else -- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); -- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); -+ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); - #endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_obmc","obmc"); - PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); - #else -- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); -- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); -- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); -+ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); -+ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); -+ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); - #endif - -- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); -- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); -- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_ENUM("ff_coder_type",coder_type,coder_type); -+ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); -+ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); -+ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); -+ PARAM_DICT_INT("ff_coder_type","coder"); - - } -Index: libquicktime-1.2.4/plugins/ffmpeg/params.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = 16 }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick - if(extradata) - { - codec->extradata = -- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - memcpy(codec->extradata, extradata, extradata_size); - codec->avctx->extradata_size = extradata_size; - codec->avctx->extradata = codec->extradata; -@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t - codec->avctx->qmin = 1; - codec->avctx->qmax = 3; - codec->avctx->rtp_payload_size = 1; // ?? -- codec->avctx->rc_buffer_aggressivity = 0.25; -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -+ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; - - #if (LIBAVCODEC_VERSION_MAJOR < 54) - codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; -@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick - // codec->avctx->time_base.den = 1; - // codec->avctx->time_base.num = lqt_video_time_scale(file, track); - -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->avctx->global_quality = codec->qscale; - - codec->avctx->width = width; -@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - -@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick - { - lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); - codec->avctx->flags |= -- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); -+ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); - } - #endif - } -@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - } -@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - } - } - else if(codec->is_imx) -@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick - if(codec->pass == 1) - { - codec->stats_file = fopen(codec->stats_filename, "w"); -- codec->avctx->flags |= CODEC_FLAG_PASS1; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; - } - else if(codec->pass == codec->total_passes) - { -@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick - fclose(codec->stats_file); - codec->stats_file = (FILE*)0; - -- codec->avctx->flags |= CODEC_FLAG_PASS2; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; - } - } - /* Open codec */ -@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick - } - - codec->frame->pts = vtrack->timestamp; -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->frame->quality = codec->qscale; - #ifdef DO_INTERLACE - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) -@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick - else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; -- if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ if(codec->avctx->max_b_frames) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata,

1 0

ports/contrib (3.7): transcode: dropped
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit b203476cc08c54fab1a768d554a45413e86b0d89 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 17:52:39 2022 +0000 transcode: dropped diff --git a/transcode/.footprint b/transcode/.footprint deleted file mode 100644 index d1112ec62..000000000 --- a/transcode/.footprint +++ /dev/null @@ -1,265 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/avifix --rwxr-xr-x root/root usr/bin/aviindex --rwxr-xr-x root/root usr/bin/avimerge --rwxr-xr-x root/root usr/bin/avisplit --rwxr-xr-x root/root usr/bin/avisync --rwxr-xr-x root/root usr/bin/pgm2txt --rwxr-xr-x root/root usr/bin/srttool --rwxr-xr-x root/root usr/bin/subtitle2pgm --rwxr-xr-x root/root usr/bin/subtitle2vobsub --rwxr-xr-x root/root usr/bin/tccat --rwxr-xr-x root/root usr/bin/tcdecode --rwxr-xr-x root/root usr/bin/tcdemux --rwxr-xr-x root/root usr/bin/tcextract --rwxr-xr-x root/root usr/bin/tcmodinfo --rwxr-xr-x root/root usr/bin/tcmp3cut --rwxr-xr-x root/root usr/bin/tcprobe --rwxr-xr-x root/root usr/bin/tcscan --rwxr-xr-x root/root usr/bin/tcxmlcheck --rwxr-xr-x root/root usr/bin/tcxpm2rgb --rwxr-xr-x root/root usr/bin/tcyait --rwxr-xr-x root/root usr/bin/transcode --rwxr-xr-x root/root usr/bin/vobsub2pgm -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/transcode/ --rwxr-xr-x root/root usr/lib/transcode/a52_decore.la --rwxr-xr-x root/root usr/lib/transcode/a52_decore.so --rwxr-xr-x root/root usr/lib/transcode/export_ac3.la --rwxr-xr-x root/root usr/lib/transcode/export_ac3.so --rwxr-xr-x root/root usr/lib/transcode/export_divx5.la --rwxr-xr-x root/root usr/lib/transcode/export_divx5.so --rwxr-xr-x root/root usr/lib/transcode/export_dv.la --rwxr-xr-x root/root usr/lib/transcode/export_dv.so --rwxr-xr-x root/root usr/lib/transcode/export_dvraw.la --rwxr-xr-x root/root usr/lib/transcode/export_dvraw.so --rwxr-xr-x root/root usr/lib/transcode/export_ffmpeg.la --rwxr-xr-x root/root usr/lib/transcode/export_ffmpeg.so --rwxr-xr-x root/root usr/lib/transcode/export_im.la --rwxr-xr-x root/root usr/lib/transcode/export_im.so --rwxr-xr-x root/root usr/lib/transcode/export_jpg.la --rwxr-xr-x root/root usr/lib/transcode/export_jpg.so --rwxr-xr-x root/root usr/lib/transcode/export_lame.la --rwxr-xr-x root/root usr/lib/transcode/export_lame.so --rwxr-xr-x root/root usr/lib/transcode/export_lzo.la --rwxr-xr-x root/root usr/lib/transcode/export_lzo.so --rwxr-xr-x root/root usr/lib/transcode/export_mp2.la --rwxr-xr-x root/root usr/lib/transcode/export_mp2.so --rwxr-xr-x root/root usr/lib/transcode/export_mp2enc.la --rwxr-xr-x root/root usr/lib/transcode/export_mp2enc.so --rwxr-xr-x root/root usr/lib/transcode/export_mpeg2enc.la --rwxr-xr-x root/root usr/lib/transcode/export_mpeg2enc.so --rwxr-xr-x root/root usr/lib/transcode/export_null.la --rwxr-xr-x root/root usr/lib/transcode/export_null.so --rwxr-xr-x root/root usr/lib/transcode/export_ogg.la --rwxr-xr-x root/root usr/lib/transcode/export_ogg.so --rwxr-xr-x root/root usr/lib/transcode/export_pcm.la --rwxr-xr-x root/root usr/lib/transcode/export_pcm.so --rwxr-xr-x root/root usr/lib/transcode/export_ppm.la --rwxr-xr-x root/root usr/lib/transcode/export_ppm.so --rwxr-xr-x root/root usr/lib/transcode/export_pvn.la --rwxr-xr-x root/root usr/lib/transcode/export_pvn.so --rwxr-xr-x root/root usr/lib/transcode/export_raw.la --rwxr-xr-x root/root usr/lib/transcode/export_raw.so --rwxr-xr-x root/root usr/lib/transcode/export_tcaud.la --rwxr-xr-x root/root usr/lib/transcode/export_tcaud.so --rwxr-xr-x root/root usr/lib/transcode/export_toolame.la --rwxr-xr-x root/root usr/lib/transcode/export_toolame.so --rwxr-xr-x root/root usr/lib/transcode/export_wav.la --rwxr-xr-x root/root usr/lib/transcode/export_wav.so -lrwxrwxrwx root/root usr/lib/transcode/export_xvid.so -> export_xvid4.so --rwxr-xr-x root/root usr/lib/transcode/export_xvid4.la --rwxr-xr-x root/root usr/lib/transcode/export_xvid4.so --rwxr-xr-x root/root usr/lib/transcode/export_yuv4mpeg.la --rwxr-xr-x root/root usr/lib/transcode/export_yuv4mpeg.so --rwxr-xr-x root/root usr/lib/transcode/filter_29to23.la --rwxr-xr-x root/root usr/lib/transcode/filter_29to23.so --rwxr-xr-x root/root usr/lib/transcode/filter_32detect.la --rwxr-xr-x root/root usr/lib/transcode/filter_32detect.so --rwxr-xr-x root/root usr/lib/transcode/filter_32drop.la --rwxr-xr-x root/root usr/lib/transcode/filter_32drop.so --rwxr-xr-x root/root usr/lib/transcode/filter_aclip.la --rwxr-xr-x root/root usr/lib/transcode/filter_aclip.so --rwxr-xr-x root/root usr/lib/transcode/filter_ascii.la --rwxr-xr-x root/root usr/lib/transcode/filter_ascii.so --rwxr-xr-x root/root usr/lib/transcode/filter_astat.la --rwxr-xr-x root/root usr/lib/transcode/filter_astat.so --rwxr-xr-x root/root usr/lib/transcode/filter_compare.la --rwxr-xr-x root/root usr/lib/transcode/filter_compare.so --rwxr-xr-x root/root usr/lib/transcode/filter_control.la --rwxr-xr-x root/root usr/lib/transcode/filter_control.so --rwxr-xr-x root/root usr/lib/transcode/filter_cpaudio.la --rwxr-xr-x root/root usr/lib/transcode/filter_cpaudio.so --rwxr-xr-x root/root usr/lib/transcode/filter_decimate.la --rwxr-xr-x root/root usr/lib/transcode/filter_decimate.so --rwxr-xr-x root/root usr/lib/transcode/filter_denoise3d.la --rwxr-xr-x root/root usr/lib/transcode/filter_denoise3d.so --rwxr-xr-x root/root usr/lib/transcode/filter_detectclipping.la --rwxr-xr-x root/root usr/lib/transcode/filter_detectclipping.so --rwxr-xr-x root/root usr/lib/transcode/filter_detectsilence.la --rwxr-xr-x root/root usr/lib/transcode/filter_detectsilence.so --rwxr-xr-x root/root usr/lib/transcode/filter_divxkey.la --rwxr-xr-x root/root usr/lib/transcode/filter_divxkey.so --rwxr-xr-x root/root usr/lib/transcode/filter_dnr.la --rwxr-xr-x root/root usr/lib/transcode/filter_dnr.so --rwxr-xr-x root/root usr/lib/transcode/filter_doublefps.la --rwxr-xr-x root/root usr/lib/transcode/filter_doublefps.so --rwxr-xr-x root/root usr/lib/transcode/filter_extsub.la --rwxr-xr-x root/root usr/lib/transcode/filter_extsub.so --rwxr-xr-x root/root usr/lib/transcode/filter_extsub2.la --rwxr-xr-x root/root usr/lib/transcode/filter_extsub2.so --rwxr-xr-x root/root usr/lib/transcode/filter_facemask.la --rwxr-xr-x root/root usr/lib/transcode/filter_facemask.so --rwxr-xr-x root/root usr/lib/transcode/filter_fieldanalysis.la --rwxr-xr-x root/root usr/lib/transcode/filter_fieldanalysis.so --rwxr-xr-x root/root usr/lib/transcode/filter_fields.la --rwxr-xr-x root/root usr/lib/transcode/filter_fields.so --rwxr-xr-x root/root usr/lib/transcode/filter_fps.la --rwxr-xr-x root/root usr/lib/transcode/filter_fps.so --rwxr-xr-x root/root usr/lib/transcode/filter_hqdn3d.la --rwxr-xr-x root/root usr/lib/transcode/filter_hqdn3d.so --rwxr-xr-x root/root usr/lib/transcode/filter_invert.la --rwxr-xr-x root/root usr/lib/transcode/filter_invert.so --rwxr-xr-x root/root usr/lib/transcode/filter_ivtc.la --rwxr-xr-x root/root usr/lib/transcode/filter_ivtc.so --rwxr-xr-x root/root usr/lib/transcode/filter_levels.la --rwxr-xr-x root/root usr/lib/transcode/filter_levels.so --rwxr-xr-x root/root usr/lib/transcode/filter_list.awk --rwxr-xr-x root/root usr/lib/transcode/filter_logo.la --rwxr-xr-x root/root usr/lib/transcode/filter_logo.so --rwxr-xr-x root/root usr/lib/transcode/filter_logoaway.la --rwxr-xr-x root/root usr/lib/transcode/filter_logoaway.so --rwxr-xr-x root/root usr/lib/transcode/filter_lowpass.la --rwxr-xr-x root/root usr/lib/transcode/filter_lowpass.so --rwxr-xr-x root/root usr/lib/transcode/filter_mask.la --rwxr-xr-x root/root usr/lib/transcode/filter_mask.so --rwxr-xr-x root/root usr/lib/transcode/filter_modfps.la --rwxr-xr-x root/root usr/lib/transcode/filter_modfps.so --rwxr-xr-x root/root usr/lib/transcode/filter_msharpen.la --rwxr-xr-x root/root usr/lib/transcode/filter_msharpen.so --rwxr-xr-x root/root usr/lib/transcode/filter_normalize.la --rwxr-xr-x root/root usr/lib/transcode/filter_normalize.so --rwxr-xr-x root/root usr/lib/transcode/filter_null.la --rwxr-xr-x root/root usr/lib/transcode/filter_null.so --rwxr-xr-x root/root usr/lib/transcode/filter_pp.la --rwxr-xr-x root/root usr/lib/transcode/filter_pp.so --rwxr-xr-x root/root usr/lib/transcode/filter_preview.la --rwxr-xr-x root/root usr/lib/transcode/filter_preview.so --rwxr-xr-x root/root usr/lib/transcode/filter_pv.la --rwxr-xr-x root/root usr/lib/transcode/filter_pv.so --rwxr-xr-x root/root usr/lib/transcode/filter_resample.la --rwxr-xr-x root/root usr/lib/transcode/filter_resample.so --rwxr-xr-x root/root usr/lib/transcode/filter_sdlview.la --rwxr-xr-x root/root usr/lib/transcode/filter_sdlview.so --rwxr-xr-x root/root usr/lib/transcode/filter_skip.la --rwxr-xr-x root/root usr/lib/transcode/filter_skip.so --rwxr-xr-x root/root usr/lib/transcode/filter_slowmo.la --rwxr-xr-x root/root usr/lib/transcode/filter_slowmo.so --rwxr-xr-x root/root usr/lib/transcode/filter_smartbob.la --rwxr-xr-x root/root usr/lib/transcode/filter_smartbob.so --rwxr-xr-x root/root usr/lib/transcode/filter_smartdeinter.la --rwxr-xr-x root/root usr/lib/transcode/filter_smartdeinter.so --rwxr-xr-x root/root usr/lib/transcode/filter_smartyuv.la --rwxr-xr-x root/root usr/lib/transcode/filter_smartyuv.so --rwxr-xr-x root/root usr/lib/transcode/filter_smooth.la --rwxr-xr-x root/root usr/lib/transcode/filter_smooth.so --rwxr-xr-x root/root usr/lib/transcode/filter_stabilize.la --rwxr-xr-x root/root usr/lib/transcode/filter_stabilize.so --rwxr-xr-x root/root usr/lib/transcode/filter_subtitler.la --rwxr-xr-x root/root usr/lib/transcode/filter_subtitler.so --rwxr-xr-x root/root usr/lib/transcode/filter_testframe.la --rwxr-xr-x root/root usr/lib/transcode/filter_testframe.so --rwxr-xr-x root/root usr/lib/transcode/filter_text.la --rwxr-xr-x root/root usr/lib/transcode/filter_text.so --rwxr-xr-x root/root usr/lib/transcode/filter_transform.la --rwxr-xr-x root/root usr/lib/transcode/filter_transform.so --rwxr-xr-x root/root usr/lib/transcode/filter_unsharp.la --rwxr-xr-x root/root usr/lib/transcode/filter_unsharp.so --rwxr-xr-x root/root usr/lib/transcode/filter_whitebalance.la --rwxr-xr-x root/root usr/lib/transcode/filter_whitebalance.so --rwxr-xr-x root/root usr/lib/transcode/filter_xsharpen.la --rwxr-xr-x root/root usr/lib/transcode/filter_xsharpen.so --rwxr-xr-x root/root usr/lib/transcode/filter_yait.la --rwxr-xr-x root/root usr/lib/transcode/filter_yait.so --rwxr-xr-x root/root usr/lib/transcode/filter_yuvdenoise.la --rwxr-xr-x root/root usr/lib/transcode/filter_yuvdenoise.so --rwxr-xr-x root/root usr/lib/transcode/filter_yuvmedian.la --rwxr-xr-x root/root usr/lib/transcode/filter_yuvmedian.so --rwxr-xr-x root/root usr/lib/transcode/import_ac3.la --rwxr-xr-x root/root usr/lib/transcode/import_ac3.so --rwxr-xr-x root/root usr/lib/transcode/import_alsa.la --rwxr-xr-x root/root usr/lib/transcode/import_alsa.so --rwxr-xr-x root/root usr/lib/transcode/import_avi.la --rwxr-xr-x root/root usr/lib/transcode/import_avi.so --rwxr-xr-x root/root usr/lib/transcode/import_bsdav.la --rwxr-xr-x root/root usr/lib/transcode/import_bsdav.so --rwxr-xr-x root/root usr/lib/transcode/import_dv.la --rwxr-xr-x root/root usr/lib/transcode/import_dv.so --rwxr-xr-x root/root usr/lib/transcode/import_dvd.la --rwxr-xr-x root/root usr/lib/transcode/import_dvd.so --rwxr-xr-x root/root usr/lib/transcode/import_ffmpeg.la --rwxr-xr-x root/root usr/lib/transcode/import_ffmpeg.so --rwxr-xr-x root/root usr/lib/transcode/import_framegen.la --rwxr-xr-x root/root usr/lib/transcode/import_framegen.so --rwxr-xr-x root/root usr/lib/transcode/import_im.la --rwxr-xr-x root/root usr/lib/transcode/import_im.so --rwxr-xr-x root/root usr/lib/transcode/import_imlist.la --rwxr-xr-x root/root usr/lib/transcode/import_imlist.so --rwxr-xr-x root/root usr/lib/transcode/import_lzo.la --rwxr-xr-x root/root usr/lib/transcode/import_lzo.so --rwxr-xr-x root/root usr/lib/transcode/import_mp3.la --rwxr-xr-x root/root usr/lib/transcode/import_mp3.so --rwxr-xr-x root/root usr/lib/transcode/import_mpeg2.la --rwxr-xr-x root/root usr/lib/transcode/import_mpeg2.so --rwxr-xr-x root/root usr/lib/transcode/import_mplayer.la --rwxr-xr-x root/root usr/lib/transcode/import_mplayer.so --rwxr-xr-x root/root usr/lib/transcode/import_null.la --rwxr-xr-x root/root usr/lib/transcode/import_null.so --rwxr-xr-x root/root usr/lib/transcode/import_ogg.la --rwxr-xr-x root/root usr/lib/transcode/import_ogg.so --rwxr-xr-x root/root usr/lib/transcode/import_pvn.la --rwxr-xr-x root/root usr/lib/transcode/import_pvn.so --rwxr-xr-x root/root usr/lib/transcode/import_raw.la --rwxr-xr-x root/root usr/lib/transcode/import_raw.so --rwxr-xr-x root/root usr/lib/transcode/import_v4l2.la --rwxr-xr-x root/root usr/lib/transcode/import_v4l2.so --rwxr-xr-x root/root usr/lib/transcode/import_vag.la --rwxr-xr-x root/root usr/lib/transcode/import_vag.so --rwxr-xr-x root/root usr/lib/transcode/import_vnc.la --rwxr-xr-x root/root usr/lib/transcode/import_vnc.so --rwxr-xr-x root/root usr/lib/transcode/import_vob.la --rwxr-xr-x root/root usr/lib/transcode/import_vob.so --rwxr-xr-x root/root usr/lib/transcode/import_x11.la --rwxr-xr-x root/root usr/lib/transcode/import_x11.so --rwxr-xr-x root/root usr/lib/transcode/import_xml.la --rwxr-xr-x root/root usr/lib/transcode/import_xml.so --rwxr-xr-x root/root usr/lib/transcode/import_xvid.la --rwxr-xr-x root/root usr/lib/transcode/import_xvid.so --rwxr-xr-x root/root usr/lib/transcode/import_yuv4mpeg.la --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/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/.signature b/transcode/.signature deleted file mode 100644 index 323b55926..000000000 --- a/transcode/.signature +++ /dev/null @@ -1,13 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36imBsL8X9qO6sUmqpdsH9RGMLS4M1EEJWcO6iL4A8TUQmPfPo5N95+a5GsiN1Z1OBHpzHoRiZfa2BB7WG12AAE= -SHA256 (Pkgfile) = cde234e028de4be3bc1aaa3cf91b88acd5e424542158271602f53dc0f959112d -SHA256 (.footprint) = 641ca436b78556e30ba420a8c14e3b56bd42f60b0af346f6c310c6857e58ba23 -SHA256 (transcode-1.1.7.tar.bz2) = 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 -SHA256 (subtitleripper-0.3-4.tgz) = 8af6c2ebe55361900871c731ea1098b1a03efa723cd29ee1d471435bd21f3ac4 -SHA256 (subtitleripper-0.3.4-linkingorder.patch) = fe79f5aa9626cd39346f805d2514e3253ed0e5c239741a01c30e715b1b57fd54 -SHA256 (subtitleripper-0.3.4-respect-ldflags.patch) = 3e31fa7baac3c1ca929e2601d08a7e2cc68baf18791d2daedc7cea3132029944 -SHA256 (transcode-ffmpeg3.patch) = 728ec3101039d98116275e36ea5cf0434a23a0bb82aca830ea9612fb9d16b062 -SHA256 (transcode-ffmpeg4.patch) = 2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721 -SHA256 (transcode-glibc-2.32.patch) = 8f7aa89be3bc38a42fe664e8f2c0e519158cb4e55b7f99f176f1622c2718b641 -SHA256 (transcode-gcc10.patch) = 13ad4d06ca5b98ef66c4e0699d92023727cd7936ef1c4bf7691e3a611c6bb786 -SHA256 (transcode-imagemagick7.patch) = 4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51 diff --git a/transcode/Pkgfile b/transcode/Pkgfile deleted file mode 100644 index a0ac719bc..000000000 --- a/transcode/Pkgfile +++ /dev/null @@ -1,86 +0,0 @@ -# Description: Command line utilities for transcoding various media formats. -# URL: https://www.transcoding.org/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: ffmpeg imagemagick lame liba52 libdvdread libmpeg2 libtheora libxvid mjpegtools x264 xorg-libxaw -# Optional: libquicktime - -name=transcode -version=1.1.7 -release=6 -source=( - https://crux.ster.zone/downloads/$name/$name-$version.tar.bz2 - #https://bitbucket.org/france/transcode-tcforge/downloads/$name-$version.tar.bz2 - http://downloads.sourceforge.net/project/subtitleripper/subtitleripper/subt… - subtitleripper-0.3.4-linkingorder.patch - subtitleripper-0.3.4-respect-ldflags.patch - transcode-ffmpeg3.patch - transcode-ffmpeg4.patch - transcode-glibc-2.32.patch - transcode-gcc10.patch - transcode-imagemagick7.patch) - -build() { - cd $name-$version - - CFLAGS+=' -pthread' - - patch -p 1 -i $SRC/transcode-ffmpeg3.patch - patch -p 1 -i $SRC/transcode-ffmpeg4.patch - patch -p 1 -i $SRC/transcode-imagemagick7.patch - patch -p 1 -i $SRC/transcode-glibc-2.32.patch - patch -p 1 -i $SRC/transcode-gcc10.patch - - sed \ - -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' \ - -i filter/subtitler/load_font.c - - autoreconf -vi - - ./configure \ - --prefix=/usr \ - --disable-dependency-tracking \ - --enable-a52 \ - --enable-alsa \ - --enable-freetype2 \ - --enable-imagemagick \ - --enable-lame \ - --enable-libdv \ - --enable-libjpeg \ - --enable-libmpeg2 \ - --enable-libmpeg2convert \ - --enable-libpostproc \ - --enable-libxml2 \ - --enable-lzo \ - --enable-mjpegtools \ - --enable-ogg \ - --enable-sdl \ - --enable-theora \ - --enable-v4l \ - --enable-vorbis \ - --enable-x264 \ - --enable-xvid - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make - make DESTDIR=$PKG install - - rm -r $PKG/usr/share/doc - - # Subtitle support - cd ../subtitleripper - patch -p1 -i $SRC/subtitleripper-0.3.4-linkingorder.patch - patch -p1 -i $SRC/subtitleripper-0.3.4-respect-ldflags.patch - - sed \ - -e 's|^$.*lppm.*$$|#\1|' \ - -e 's|^$.*D_HAVE_LIB_PPM.*$$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile - - make - install -m 0755 -t $PKG/usr/bin \ - pgm2txt srttool subtitle2pgm \ - subtitle2vobsub vobsub2pgm -} diff --git a/transcode/subtitleripper-0.3.4-linkingorder.patch b/transcode/subtitleripper-0.3.4-linkingorder.patch deleted file mode 100644 index 7efe22346..000000000 --- a/transcode/subtitleripper-0.3.4-linkingorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/transcode/subtitleripper-0.3.4-respect-ldflags.patch deleted file mode 100644 index 2af11d257..000000000 --- a/transcode/subtitleripper-0.3.4-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/transcode/transcode-ffmpeg3.patch b/transcode/transcode-ffmpeg3.patch deleted file mode 100644 index 869a9eb63..000000000 --- a/transcode/transcode-ffmpeg3.patch +++ /dev/null @@ -1,1241 +0,0 @@ -Submitted By: Armion K. <krejzi at email dot com> -Date: 2016-05-06 -Initial Package Version: 1.1.7 -Upstream Status: Unknown -Origin: Gentoo and Debian -Description: Fixes building against FFmpeg version >= 3.0.0 - ---- a/encode/encode_lavc.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/encode/encode_lavc.c 2016-02-15 16:08:37.914488116 +0100 -@@ -74,6 +74,9 @@ - int lmin; - int lmax; - int me_method; -+ int luma_elim_threshold; -+ int chroma_elim_threshold; -+ int quantizer_noise_shaping; - - /* same as above for flags */ - struct { -@@ -114,6 +117,7 @@ - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -+ AVDictionary * ff_opts; - - AVCodec *ff_vcodec; - -@@ -164,6 +168,7 @@ - TC_CODEC_ERROR - }; - -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static const enum CodecID tc_lavc_internal_codecs[] = { - CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, - CODEC_ID_H263I, CODEC_ID_H263P, -@@ -176,6 +181,20 @@ - CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, - CODEC_ID_NONE - }; -+#else -+static const enum AVCodecID tc_lavc_internal_codecs[] = { -+ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, -+ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, -+ AV_CODEC_ID_H264, -+ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, -+ AV_CODEC_ID_RV10, -+ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, -+ AV_CODEC_ID_DVVIDEO, -+ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, -+ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, -+ AV_CODEC_ID_NONE -+}; -+#endif - - static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; - -@@ -214,7 +233,7 @@ - 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); - } - -@@ -228,7 +247,7 @@ - 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, -@@ -244,7 +263,7 @@ - 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, -@@ -256,7 +275,7 @@ - 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); - - } -@@ -266,7 +285,7 @@ - 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, -@@ -591,21 +610,21 @@ - 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 { -@@ -615,10 +634,10 @@ - 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: -@@ -937,7 +956,11 @@ - static void tc_lavc_config_defaults(TCLavcPrivateData *pd) - { - /* first of all reinitialize lavc data */ -+#if LIBAVCODEC_VERSION_MAJOR < 55 - avcodec_get_context_defaults(&pd->ff_vcontext); -+#else -+ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); -+#endif - - pd->confdata.thread_count = 1; - -@@ -955,8 +978,6 @@ - /* - * context *transcode* (not libavcodec) defaults - */ -- pd->ff_vcontext.mb_qmin = 2; -- pd->ff_vcontext.mb_qmax = 31; - pd->ff_vcontext.max_qdiff = 3; - pd->ff_vcontext.max_b_frames = 0; - pd->ff_vcontext.me_range = 0; -@@ -977,8 +998,8 @@ - pd->ff_vcontext.mpeg_quant = 0; - pd->ff_vcontext.rc_initial_cplx = 0.0; - pd->ff_vcontext.rc_qsquish = 1.0; -- pd->ff_vcontext.luma_elim_threshold = 0; -- pd->ff_vcontext.chroma_elim_threshold = 0; -+ pd->confdata.luma_elim_threshold = 0; -+ pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; - pd->ff_vcontext.dct_algo = FF_DCT_AUTO; - pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; -@@ -1002,7 +1023,7 @@ - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; -- pd->ff_vcontext.quantizer_noise_shaping = 0; -+ pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; - } - -@@ -1033,17 +1054,10 @@ - pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; - - pd->ff_vcontext.flags = 0; -- SET_FLAG(pd, mv0); -- SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, alt); -- SET_FLAG(pd, vdpart); -- SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -- SET_FLAG(pd, aiv); -- SET_FLAG(pd, umv); - SET_FLAG(pd, psnr); - SET_FLAG(pd, trell); - SET_FLAG(pd, gray); -@@ -1064,6 +1078,36 @@ - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } -+ if (pd->confdata.flags.alt) { -+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); -+ } -+ if (pd->confdata.flags.vdpart) { -+ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); -+ } -+ if (pd->confdata.flags.umv) { -+ av_dict_set(&(pd->ff_opts), "umv", "1", 0); -+ } -+ if (pd->confdata.flags.aiv) { -+ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); -+ } -+ if (pd->confdata.flags.cbp) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); -+ } -+ if (pd->confdata.flags.mv0) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); -+ } -+ if (pd->confdata.flags.naq) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); -+ } -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) -+ -+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); - } - - #undef SET_FLAG -@@ -1116,12 +1160,10 @@ - // handled by transcode core - // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - // handled by transcode core -- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, -- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, -- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, -+ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, - { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, -@@ -1150,8 +1192,8 @@ - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, - { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1177,25 +1219,25 @@ - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, -+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - -- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, -+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, -+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, -- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, -+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, - #endif -- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, -- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, -+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, -@@ -1345,12 +1387,14 @@ - - pd = self->userdata; - -+ pd->ff_opts = NULL; -+ - pd->flush_flag = vob->encoder_flush; - - /* 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 -@@ -1387,7 +1431,7 @@ - pd->confdata.thread_count, - (pd->confdata.thread_count > 1) ?"s" :""); - } -- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); -+ pd->ff_vcontext.thread_count = pd->confdata.thread_count; - - pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); - if (pd->ff_vcodec == NULL) { -@@ -1397,11 +1441,11 @@ - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -- tc_log_error(MOD_NAME, "avcodec_open() failed"); -+ tc_log_error(MOD_NAME, "avcodec_open2() failed"); - goto failed; - } - /* finally, pass up the extradata, if any */ -@@ -1483,6 +1527,8 @@ - vframe_list_t *outframe) - { - TCLavcPrivateData *pd = NULL; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - TC_MODULE_SELF_CHECK(self, "encode_video"); - -@@ -1497,12 +1543,15 @@ - - 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)", ---- a/export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100 -@@ -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); -@@ -346,7 +346,7 @@ - - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- -- avcodec_get_context_defaults(&mpa_ctx); -+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); - #if LIBAVCODEC_VERSION_MAJOR < 53 - mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - #else -@@ -359,11 +359,11 @@ - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&mpa_ctx, mpa_codec); -+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); - 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); - } - -@@ -846,6 +846,9 @@ - #ifdef HAVE_FFMPEG - int in_size, out_size; - char *in_buf; -+ int got_packet; -+ AVPacket avpkt = { 0 }; -+ AVFrame *frame = av_frame_alloc(); - - //-- input buffer and amount of bytes -- - in_size = aud_size; -@@ -866,10 +869,14 @@ - - ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed); - -+ frame->nb_samples = mpa_ctx.frame_size; -+ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1); -+ avpkt.data = output; -+ avpkt.size = OUTPUT_SIZE; - TC_LOCK_LIBAVCODEC; -- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, -- OUTPUT_SIZE, (short *)mpa_buf); -+ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; -+ out_size = avpkt.size; - tc_audio_write(output, out_size, avifile); - - in_size -= bytes_needed; -@@ -884,6 +891,7 @@ - - ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail); - mpa_buf_ptr += bytes_avail; -+ av_frame_free(&frame); - return (0); - } - } //bytes availabe from last call? -@@ -893,10 +901,15 @@ - //---------------------------------------------------- - - while (in_size >= mpa_bytes_pf) { -+ av_frame_unref(frame); -+ frame->nb_samples = mpa_ctx.frame_size; -+ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1); -+ avpkt.data = output; -+ avpkt.size = OUTPUT_SIZE; - TC_LOCK_LIBAVCODEC; -- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, -- OUTPUT_SIZE, (short *)in_buf); -+ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; -+ out_size = avpkt.size; - - tc_audio_write(output, out_size, avifile); - -@@ -904,6 +917,8 @@ - in_buf += mpa_bytes_pf; - } - -+ av_frame_free(&frame); -+ - //-- hold rest of bytes in mpa-buffer -- - //-------------------------------------- - if (in_size > 0) { ---- a/export/export_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/export/export_ffmpeg.c 2016-02-15 16:08:37.915488139 +0100 -@@ -122,6 +122,7 @@ - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; -+static AVDictionary *lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -180,7 +181,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -249,9 +250,9 @@ - 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 */ - } - } -@@ -266,7 +267,10 @@ - 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); -@@ -470,7 +474,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -486,11 +489,11 @@ - codec->name, codec->fourCC, codec->comments); - } - -- lavc_venc_context = avcodec_alloc_context(); -- lavc_venc_frame = avcodec_alloc_frame(); -+ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); -+ 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) { -@@ -634,7 +637,7 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -674,7 +677,7 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -838,8 +841,13 @@ - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; -- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; -- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) -+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -870,7 +878,7 @@ - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; - lavc_venc_context->noise_reduction = lavc_param_noise_reduction; -- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; -+ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); - lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; - lavc_venc_context->skip_top = lavc_param_skip_top; - lavc_venc_context->skip_bottom = lavc_param_skip_bottom; -@@ -887,7 +895,7 @@ - lavc_venc_context->thread_count); - } - -- avcodec_thread_init(lavc_venc_context, lavc_param_threads); -+ lavc_venc_context->thread_count = lavc_param_threads; - - if (lavc_param_intra_matrix) { - char *tmp; -@@ -1061,19 +1069,18 @@ - lavc_venc_context->ildct_cmp = lavc_param_ildct_cmp; - lavc_venc_context->dia_size = lavc_param_dia_size; - lavc_venc_context->flags |= lavc_param_qpel; -- lavc_venc_context->flags |= lavc_param_gmc; -+ if(lavc_param_gmc) -+ av_dict_set(&lavc_venc_opts, "gmc", "1", 0); - lavc_venc_context->flags |= lavc_param_closedgop; - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; -- lavc_venc_context->flags |= lavc_param_umv; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_data_partitioning; -- lavc_venc_context->flags |= lavc_param_cbp; -- lavc_venc_context->flags |= lavc_param_mv0; -- lavc_venc_context->flags |= lavc_param_qp_rd; -- lavc_venc_context->flags |= lavc_param_scan_offset; -- lavc_venc_context->flags |= lavc_param_ss; -- lavc_venc_context->flags |= lavc_param_alt; -+ if(lavc_param_cbp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); -+ if(lavc_param_mv0) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0); -+ if(lavc_param_qp_rd) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1084,7 +1091,7 @@ - if (lavc_param_gray) - lavc_venc_context->flags |= CODEC_FLAG_GRAY; - if (lavc_param_normalize_aqp) -- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); - - switch(vob->encode_fields) { - case TC_ENCODE_FIELDS_TOP_FIRST: -@@ -1112,7 +1119,7 @@ - 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) -@@ -1121,18 +1128,18 @@ - 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; - } - -@@ -1203,9 +1210,8 @@ - - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - -- - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ -- if (lavc_param_video_preset) { -+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; - video_codec_name = ffmpeg_codec_name(codec->name); - -@@ -1241,20 +1247,39 @@ - } - } - -+ if (lavc_param_scan_offset) { -+ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); -+ } -+ -+ if (lavc_param_ss) { -+ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); -+ } -+ -+ if (lavc_param_alt) { -+ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); -+ } -+ -+ if (lavc_param_umv) { -+ av_dict_set(&lavc_venc_opts, "umv", "1", 0); -+ } -+ -+ if (lavc_param_data_partitioning) { -+ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); -+ } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " -- "(lavc_venc_context->codec->encode == NULL)"); -+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); - return TC_EXPORT_ERROR; - } - -@@ -1574,6 +1599,8 @@ - - 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) { - -@@ -1598,7 +1625,7 @@ - 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, -@@ -1628,7 +1655,7 @@ - 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, -@@ -1639,7 +1666,7 @@ - - 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, -@@ -1652,13 +1679,17 @@ - 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; ---- a/export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/export/ffmpeg_cfg.c 2016-02-15 16:08:37.916488161 +0100 -@@ -34,8 +34,6 @@ - //int lavc_param_vqscale = 0; - //int lavc_param_vqmin = 2; - //int lavc_param_vqmax = 31; --int lavc_param_mb_qmin = 2; --int lavc_param_mb_qmax = 31; - int lavc_param_lmin = 2; - int lavc_param_lmax = 31; - int lavc_param_vqdiff = 3; -@@ -126,7 +124,7 @@ - //int lavc_param_atag = 0; - //int lavc_param_abitrate = 224; - --char *lavc_param_video_preset = "medium"; -+char *lavc_param_video_preset = "none"; - char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; - - TCConfigEntry lavcopts_conf[]={ -@@ -143,15 +141,13 @@ - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, -- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, -+ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, - // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -160,9 +156,9 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,26 +207,26 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, -+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, -- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, -- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, -+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, -+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, -+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, -- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, -+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, - {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, ---- a/export/ffmpeg_cfg.h 2011-11-19 17:50:27.000000000 +0100 -+++ b/export/ffmpeg_cfg.h 2016-02-15 16:08:37.916488161 +0100 -@@ -13,8 +13,6 @@ - //extern int lavc_param_vqscale; - //extern int lavc_param_vqmin; - //extern int lavc_param_vqmax; --extern int lavc_param_mb_qmin; --extern int lavc_param_mb_qmax; - extern int lavc_param_lmin; - extern int lavc_param_lmax; - extern int lavc_param_vqdiff; ---- a/filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/filter/filter_pp.c 2016-02-15 16:08:37.916488161 +0100 -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - ---- a/import/decode_lavc.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/import/decode_lavc.c 2016-02-15 16:09:00.252988897 +0100 -@@ -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, {""}}}; - -@@ -170,7 +170,7 @@ - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(NULL); - if (lavc_dec_context == NULL) { - tc_log_error(__FILE__, "Could not allocate enough memory."); - goto decoder_error; -@@ -181,12 +181,12 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; - -- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { -+ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { - tc_log_error(__FILE__, "Could not initialize the '%s' codec.", - codec->name); - goto decoder_error; -@@ -290,8 +290,8 @@ - - // 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; -@@ -315,7 +315,7 @@ - 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++) { -@@ -334,8 +334,8 @@ - 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++) { -@@ -354,8 +354,8 @@ - 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++) { ---- a/import/import_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/import/import_ffmpeg.c 2016-02-15 16:08:48.269720627 +0100 -@@ -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, {""}}}; - -@@ -302,7 +302,7 @@ - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); - if (lavc_dec_context == NULL) { - tc_log_error(MOD_NAME, "Could not allocate enough memory."); - return TC_IMPORT_ERROR; -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -@@ -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; - } - -@@ -344,7 +344,7 @@ - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); -+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", -@@ -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; - } - -@@ -580,8 +580,8 @@ - - // 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); -@@ -612,7 +612,7 @@ - } - 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); -@@ -640,8 +640,8 @@ - } - 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); -@@ -669,8 +669,8 @@ - } - 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); ---- a/import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ b/import/probe_ffmpeg.c 2016-02-15 16:08:37.917488184 +0100 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -@@ -109,7 +109,7 @@ - return; - } - -- ret = av_find_stream_info(lavf_dmx_context); -+ ret = avformat_find_stream_info(lavf_dmx_context, NULL); - if (ret < 0) { - tc_log_error(__FILE__, "unable to fetch informations from '%s'" - " (libavformat failure)", -@@ -120,7 +120,11 @@ - - translate_info(lavf_dmx_context, ipipe->probe_info); - -+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) -+ avformat_close_input(&lavf_dmx_context); -+#else - av_close_input_file(lavf_dmx_context); -+#endif - return; - } - ---- a/libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100 -+++ b/libtc/tcavcodec.h 2016-02-15 16:08:37.917488184 +0100 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) diff --git a/transcode/transcode-ffmpeg4.patch b/transcode/transcode-ffmpeg4.patch deleted file mode 100644 index e602621d2..000000000 --- a/transcode/transcode-ffmpeg4.patch +++ /dev/null @@ -1,494 +0,0 @@ ---- a/encode/encode_lavc.c -+++ b/encode/encode_lavc.c -@@ -77,6 +77,13 @@ struct tclavcconfigdata_ { - int luma_elim_threshold; - int chroma_elim_threshold; - int quantizer_noise_shaping; -+ int inter_quant_bias; -+ int intra_quant_bias; -+ int scenechange_factor; -+ int rc_strategy; -+ float rc_initial_cplx; -+ float rc_qsquish; -+ float border_masking; - - /* same as above for flags */ - struct { -@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc - switch (vob->divxmultipass) { - case 1: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1; - pd->stats_file = fopen(vob->divxlogfile, "w"); - if (pd->stats_file == NULL) { - tc_log_error(MOD_NAME, "could not create 2pass log file" -@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 2: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2; - pd->stats_file = fopen(vob->divxlogfile, "r"); - if (pd->stats_file == NULL){ - tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\"" -@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 3: - /* fixed qscale :p */ -- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE; - pd->ff_venc_frame.quality = vob->divxbitrate; - break; - } -@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa - pd->confdata.rc_buffer_size = 0; - pd->confdata.lmin = 2; - pd->confdata.lmax = 31; -- pd->confdata.me_method = ME_EPZS; -+ pd->confdata.me_method = 0; - - memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags)); - pd->confdata.turbo_setup = 0; -@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.me_range = 0; - pd->ff_vcontext.mb_decision = 0; - pd->ff_vcontext.scenechange_threshold = 0; -- pd->ff_vcontext.scenechange_factor = 1; -+ pd->confdata.scenechange_factor = 1; - pd->ff_vcontext.b_frame_strategy = 0; - pd->ff_vcontext.b_sensitivity = 40; - pd->ff_vcontext.brd_scale = 0; - pd->ff_vcontext.bidir_refine = 0; -- pd->ff_vcontext.rc_strategy = 2; -+ pd->confdata.rc_strategy = 2; - pd->ff_vcontext.b_quant_factor = 1.25; - pd->ff_vcontext.i_quant_factor = 0.8; - pd->ff_vcontext.b_quant_offset = 1.25; -@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.qblur = 0.5; - pd->ff_vcontext.qcompress = 0.5; - pd->ff_vcontext.mpeg_quant = 0; -- pd->ff_vcontext.rc_initial_cplx = 0.0; -- pd->ff_vcontext.rc_qsquish = 1.0; -+ pd->confdata.rc_initial_cplx = 0.0; -+ pd->confdata.rc_qsquish = 1.0; - pd->confdata.luma_elim_threshold = 0; - pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; -@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.temporal_cplx_masking = 0.0; - pd->ff_vcontext.spatial_cplx_masking = 0.0; - pd->ff_vcontext.p_masking = 0.0; -- pd->ff_vcontext.border_masking = 0.0; -+ pd->confdata.border_masking = 0.0; - pd->ff_vcontext.me_pre_cmp = 0; - pd->ff_vcontext.me_cmp = 0; - pd->ff_vcontext.me_sub_cmp = 0; -@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.pre_me = 1; - pd->ff_vcontext.me_subpel_quality = 8; - pd->ff_vcontext.refs = 1; -- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; -- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; - pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; -@@ -1044,14 +1049,16 @@ static void tc_lavc_config_defaults(TCLa - */ - static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd) - { -+ char buf[1024]; - /* some translation... */ - pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000; - pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000; - pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000; - pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024; -- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5); -- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5); -- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0); -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0); - - pd->ff_vcontext.flags = 0; - SET_FLAG(pd, qpel); -@@ -1075,8 +1080,8 @@ static void tc_lavc_dispatch_settings(TC - } - if (pd->interlacing.active) { - /* enforce interlacing */ -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { - av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); -@@ -1100,14 +1105,24 @@ static void tc_lavc_dispatch_settings(TC - av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); - } - -- char buf[1024]; - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ - av_dict_set(&(pd->ff_opts), opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) - - set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); - set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); -+ set_dict_opt(inter_quant_bias, "pbias"); -+ set_dict_opt(intra_quant_bias, "ibias"); -+ set_dict_opt(me_method, "me_method"); -+ set_dict_opt(scenechange_factor, "sc_factor"); -+ set_dict_opt(rc_strategy, "rc_strategy"); -+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx"); -+ set_dict_float_opt(rc_qsquish, "qsquish"); -+ set_dict_float_opt(border_masking, "border_mask"); - } - - #undef SET_FLAG -@@ -1168,7 +1189,7 @@ static int tc_lavc_read_config(TCLavcPri - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 }, -- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, -+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, - { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, - { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 }, - { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1179,7 +1200,7 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 }, -- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, -+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, - { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 }, -@@ -1189,9 +1210,9 @@ static int tc_lavc_read_config(TCLavcPri - { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 }, - // { "vrc_eq", }, // not yet supported - { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 }, -- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, -+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported -- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, - { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -@@ -1203,7 +1224,7 @@ static int tc_lavc_read_config(TCLavcPri - { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 }, - { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, - { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, -@@ -1216,37 +1237,37 @@ static int tc_lavc_read_config(TCLavcPri - { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 }, - { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 }, -- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, -+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME }, -+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT }, - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else -- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, -+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED }, - #endif - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, -+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, - #else - { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #endif -- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY }, -- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV }, -- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP }, -+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY }, -+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV }, -+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP }, - - // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported - /* End of the config file */ ---- a/export/export_ffmpeg.c -+++ b/export/export_ffmpeg.c -@@ -831,14 +831,11 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; - lavc_venc_context->qcompress = lavc_param_vqcompress; - lavc_venc_context->qblur = lavc_param_vqblur; - lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames; - lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor; -- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; - -@@ -846,8 +843,23 @@ MOD_init - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", val); \ - av_dict_set(&lavc_venc_opts, opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) - set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax"); -+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy"); -+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish"); -+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp"); -+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq"); -+ set_dict_opt(lavc_param_rc_eq, "rc_eq"); -+ set_dict_opt(lavc_param_vme, "me_method"); -+ set_dict_opt(lavc_param_ibias, "ibias"); -+ set_dict_opt(lavc_param_pbias, "pbias"); -+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity"); -+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -856,15 +868,9 @@ MOD_init - lavc_venc_context->strict_std_compliance= lavc_param_strict; - lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor; - lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset; -- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish; -- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp; -- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq; -- lavc_venc_context->rc_eq = lavc_param_rc_eq; - lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000; - lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000; - lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024; -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; -- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx; - lavc_venc_context->debug = lavc_param_debug; - lavc_venc_context->last_predictor_count= lavc_param_last_pred; - lavc_venc_context->pre_me = lavc_param_pre_me; -@@ -872,8 +878,6 @@ MOD_init - lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size; - lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality; - lavc_venc_context->me_range = lavc_param_me_range; -- lavc_venc_context->intra_quant_bias = lavc_param_ibias; -- lavc_venc_context->inter_quant_bias = lavc_param_pbias; - lavc_venc_context->coder_type = lavc_param_coder; - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; -@@ -1081,6 +1085,8 @@ MOD_init - av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0); - if(lavc_param_qp_rd) - av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); -+ if (lavc_param_normalize_aqp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1089,9 +1095,7 @@ MOD_init - #endif - - if (lavc_param_gray) -- lavc_venc_context->flags |= CODEC_FLAG_GRAY; -- if (lavc_param_normalize_aqp) -- av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); -+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY; - - switch(vob->encode_fields) { - case TC_ENCODE_FIELDS_TOP_FIRST: -@@ -1109,9 +1113,9 @@ MOD_init - } - - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_DCT : 0; -+ AV_CODEC_FLAG_INTERLACED_DCT : 0; - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_ME : 0; -+ AV_CODEC_FLAG_INTERLACED_ME : 0; - - lavc_venc_context->flags |= lavc_param_psnr; - do_psnr = lavc_param_psnr; -@@ -1158,7 +1162,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS1; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1; - stats_file = fopen(vob->divxlogfile, "w"); - if (stats_file == NULL){ - tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".", -@@ -1172,7 +1176,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS2; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2; - stats_file= fopen(vob->divxlogfile, "r"); - if (stats_file==NULL){ - tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for " -@@ -1203,12 +1207,11 @@ MOD_init - break; - case 3: - /* fixed qscale :p */ -- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; - lavc_venc_frame->quality = vob->divxbitrate; - break; - } - -- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { ---- a/export/ffmpeg_cfg.c -+++ b/export/ffmpeg_cfg.c -@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; - int lavc_param_pre_me= 1; - int lavc_param_me_subpel_quality= 8; - int lavc_param_me_range=0; --int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS; --int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS; -+int lavc_param_ibias=0; -+int lavc_param_pbias=0; - int lavc_param_coder=0; - int lavc_param_context=0; - char *lavc_param_intra_matrix = NULL; -@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000}, - {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, -- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV}, -+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV}, - {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5}, - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={ - {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20}, - {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0}, - {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, -- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR}, -+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR}, - {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, -@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={ - {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, - {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, -- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL}, -+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT}, -+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT}, - #else - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1}, - #endif -@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={ - {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8}, - {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC}, - #else -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED}, - #endif - {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, -@@ -222,13 +222,13 @@ TCConfigEntry lavcopts_conf[]={ - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, -+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, - {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, -- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, -+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED}, -+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP}, - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, ---- a/import/import_ffmpeg.c -+++ b/import/import_ffmpeg.c -@@ -310,7 +310,7 @@ do_avi: - lavc_dec_context->width = x_dim; - lavc_dec_context->height = y_dim; - -- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY; -+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else ---- a/filter/filter_resample.c -+++ b/filter/filter_resample.c -@@ -37,6 +37,7 @@ - #include "libtc/optstr.h" - #include "libtc/tcavcodec.h" - #include "libtc/tcmodule-plugin.h" -+#include <libavresample/avresample.h> - - - typedef struct { -@@ -45,7 +46,7 @@ typedef struct { - - int bytes_per_sample; - -- ReSampleContext *resample_ctx; -+ AVAudioResampleContext *resample_ctx; - } ResamplePrivateData; - - static const char resample_help[] = "" ---- a/import/probe_ffmpeg.c -+++ b/import/probe_ffmpeg.c -@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) { -- info->fps = av_q2d(st->r_frame_rate); -+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { -+ info->fps = av_q2d(st->avg_frame_rate); - } else { - /* watch out here */ - info->fps = 1.0/av_q2d(st->codec->time_base); diff --git a/transcode/transcode-gcc10.patch b/transcode/transcode-gcc10.patch deleted file mode 100644 index fcee415de..000000000 --- a/transcode/transcode-gcc10.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/import/demux_pass.c -+++ b/import/demux_pass.c -@@ -32,8 +32,6 @@ - #include "packets.h" - - --int gop, gop_pts, gop_cnt; -- - /* if you listen carefully, then you can hear the desesperate - * whisper of this code calling for a rewrite. Or for a redesign. - * Or both. -- FR ---- a/import/extract_ac3.c -+++ b/import/extract_ac3.c -@@ -334,7 +334,6 @@ - FILE *fd; - - #define MAX_BUF 4096 --char audio[MAX_BUF]; - - - /* from ac3scan.c */ -@@ -472,6 +471,8 @@ - void extract_ac3(info_t *ipipe) - { - -+ char audio[MAX_BUF]; -+ - int error=0; - - avi_t *avifile; ---- a/import/extract_mp3.c -+++ b/import/extract_mp3.c -@@ -243,7 +243,6 @@ - } - - #define MAX_BUF 4096 --char audio[MAX_BUF]; - - /* ------------------------------------------------------------ - * -@@ -258,6 +257,7 @@ - - void extract_mp3(info_t *ipipe) - { -+ char audio[MAX_BUF]; - - int error=0; - diff --git a/transcode/transcode-glibc-2.32.patch b/transcode/transcode-glibc-2.32.patch deleted file mode 100644 index 8b5ea837a..000000000 --- a/transcode/transcode-glibc-2.32.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- transcode-1.1.7/import/v4l/import_v4l2.c.orig 2020-08-28 08:28:44.311434934 +0000 -+++ transcode-1.1.7/import/v4l/import_v4l2.c 2020-08-28 08:41:19.279323984 +0000 -@@ -455,7 +455,7 @@ - tc_log_warn(MOD_NAME, - "driver does not support cropping" - "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled", -- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); -+ strerror(errno)); - return TC_ERROR; - } - if (verbose_flag > TC_INFO) { -@@ -485,7 +485,7 @@ - tc_log_warn(MOD_NAME, - "driver does not support inquiring cropping" - " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", -- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); -+ strerror(errno)); - return -1; - } - -@@ -513,7 +513,7 @@ - tc_log_warn(MOD_NAME, - "driver does not support inquering cropping" - " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")", -- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); -+ strerror(errno)); - return -1; - } - if (verbose_flag > TC_INFO) { -@@ -613,7 +613,7 @@ - if (err < 0) { - if (verbose_flag) { - tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")", -- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); -+ strerror(errno)); - } - } - return TC_OK; -@@ -628,7 +628,7 @@ - err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid); - if (err < 0) { - tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")", -- errno <= sys_nerr ? sys_errlist[errno] : "unknown"); -+ strerror(errno)); - memset(&stdid, 0, sizeof(v4l2_std_id)); - } - diff --git a/transcode/transcode-imagemagick7.patch b/transcode/transcode-imagemagick7.patch deleted file mode 100644 index b9f147664..000000000 --- a/transcode/transcode-imagemagick7.patch +++ /dev/null @@ -1,794 +0,0 @@ -http://git.pld-linux.org/?p=packages/transcode.git;a=blob_plain;f=imagemagick7.patch;h=8411f89b843764eff8f4aaddb314d7773d1bcec8;hb=HEAD - ---- transcode-1.1.7/configure.in -+++ transcode-1.1.7/configure.in -@@ -1105,8 +1105,8 @@ - dnl ImageMagick - dnl - IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS $($PKG_CONFIG --libs ImageMagick)" --TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [magick/api.h], -- none, InitializeMagick, Wand, [http://www.imagemagick.org/] -+TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [MagickWand/MagickWand.h], -+ none, InitializeMagick, MagickWand, [http://www.imagemagick.org/] - TC_PKG_HAVE(imagemagick, IMAGEMAGICK) - if test x"$have_imagemagick" = x"yes" ; then - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -1114,6 +1114,7 @@ - AC_CHECK_HEADER([wand/magick-wand.h], - [AC_DEFINE([HAVE_BROKEN_WAND], [1], ["have old wand header"])]) - CPPFLAGS="$SAVE_CPPFLAGS" -+ IMAGEMAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS $($PKG_CONFIG --cflags ImageMagick)" - fi - - dnl ---- transcode-1.1.7/export/export_im.c -+++ transcode-1.1.7/export/export_im.c -@@ -23,7 +23,7 @@ - - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ --#include <magick/api.h> -+#include <MagickCore/MagickCore.h> - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME - #undef PACKAGE_STRING -@@ -82,7 +82,7 @@ - - codec = (vob->im_v_codec == CODEC_YUV) ? CODEC_YUV : CODEC_RGB; - -- InitializeMagick(""); -+ MagickCoreGenesis("", MagickFalse); - - image_info=CloneImageInfo((ImageInfo *) NULL); - -@@ -169,8 +169,8 @@ - MOD_encode - { - -- ExceptionInfo exception_info; -- char *out_buffer = param->buffer; -+ ExceptionInfo *exception_info; -+ unsigned char *out_buffer = param->buffer; - Image *image=NULL; - int res; - -@@ -179,7 +179,7 @@ - - if(param->flag == TC_VIDEO) { - -- GetExceptionInfo(&exception_info); -+ exception_info = AcquireExceptionInfo(); - - res = tc_snprintf(buf2, PATH_MAX, "%s%06d.%s", prefix, counter++, type); - if (res < 0) { -@@ -193,11 +193,11 @@ - out_buffer = tmp_buffer; - } - -- image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, &exception_info); -+ image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, exception_info); - - strlcpy(image->filename, buf2, MaxTextExtent); - -- WriteImage(image_info, image); -+ WriteImage(image_info, image, exception_info); - DestroyImage(image); - - return(0); -@@ -220,8 +220,7 @@ - - if(param->flag == TC_VIDEO) { - DestroyImageInfo(image_info); -- ConstituteComponentTerminus(); -- DestroyMagick(); -+ MagickCoreTerminus(); - - free(tmp_buffer); - tmp_buffer = NULL; ---- transcode-1.1.7/filter/filter_compare.c -+++ transcode-1.1.7/filter/filter_compare.c -@@ -24,7 +24,7 @@ - - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ --#include <magick/api.h> -+#include <MagickCore/MagickCore.h> - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME - #undef PACKAGE_STRING -@@ -111,9 +111,9 @@ - Image *pattern, *resized, *orig = 0; - ImageInfo *image_info; - -- PixelPacket *pixel_packet; -+ Quantum *pixel_quantum; - pixelsMask *pixel_last; -- ExceptionInfo exception_info; -+ ExceptionInfo *exception_info; - - if(ptr->tag & TC_FILTER_GET_CONFIG) { - char buf[128]; -@@ -139,7 +139,7 @@ - if(ptr->tag & TC_FILTER_INIT) - { - -- unsigned int t,r,index; -+ unsigned int t,r; - pixelsMask *temp; - - compare[instance] = tc_malloc(sizeof(compareData)); -@@ -190,22 +190,22 @@ - tc_log_perror(MOD_NAME, "could not open file for writing"); - } - -- InitializeMagick(""); -+ MagickCoreGenesis("", MagickFalse); - if (verbose > 1) - tc_log_info(MOD_NAME, "Magick Initialized successfully"); - -- GetExceptionInfo(&exception_info); -+ exception_info = AcquireExceptionInfo(); - image_info = CloneImageInfo ((ImageInfo *) NULL); - strlcpy(image_info->filename, pattern_name, MaxTextExtent); - if (verbose > 1) - tc_log_info(MOD_NAME, "Trying to open image"); - orig = ReadImage(image_info, -- &exception_info); -+ exception_info); - - if (orig == (Image *) NULL) { -- MagickWarning(exception_info.severity, -- exception_info.reason, -- exception_info.description); -+ MagickWarning(exception_info->severity, -+ exception_info->reason, -+ exception_info->description); - strlcpy(pattern_name, "/dev/null", sizeof(pattern_name)); - }else{ - if (verbose > 1) -@@ -228,42 +228,41 @@ - if (orig != NULL){ - // Flip and resize - if (compare[instance]->vob->im_v_codec == CODEC_YUV) -- TransformRGBImage(orig,YCbCrColorspace); -+ TransformImageColorspace(orig, YCbCrColorspace, exception_info); - if (verbose > 1) tc_log_info(MOD_NAME, "Resizing the Image"); - resized = ResizeImage(orig, - compare[instance]->width, - compare[instance]->height, - GaussianFilter, -- 1, -- &exception_info); -+ exception_info); - if (verbose > 1) - tc_log_info(MOD_NAME, "Flipping the Image"); -- pattern = FlipImage(resized, &exception_info); -+ pattern = FlipImage(resized, exception_info); - if (pattern == (Image *) NULL) { -- MagickError (exception_info.severity, -- exception_info.reason, -- exception_info.description); -+ MagickError (exception_info->severity, -+ exception_info->reason, -+ exception_info->description); - } - - // Filling the matrix with the pixels values not - // alpha - - if (verbose > 1) tc_log_info(MOD_NAME, "GetImagePixels"); -- pixel_packet = GetImagePixels(pattern,0,0, -+ pixel_quantum = GetAuthenticPixels(pattern,0,0, - pattern->columns, -- pattern->rows); -+ pattern->rows, -+ exception_info); - - if (verbose > 1) tc_log_info(MOD_NAME, "Filling the Image matrix"); - for (t = 0; t < pattern->rows; t++) - for (r = 0; r < pattern->columns; r++){ -- index = t*pattern->columns + r; -- if (pixel_packet[index].opacity == 0){ -+ if (GetPixelAlpha(pattern, pixel_quantum) == QuantumRange) { - temp=tc_malloc(sizeof(struct pixelsMask)); - temp->row=t; - temp->col=r; -- temp->r = (uint8_t)ScaleQuantumToChar(pixel_packet[index].red); -- temp->g = (uint8_t)ScaleQuantumToChar(pixel_packet[index].green); -- temp->b = (uint8_t)ScaleQuantumToChar(pixel_packet[index].blue); -+ temp->r = (uint8_t)ScaleQuantumToChar(GetPixelRed(pattern, pixel_quantum)); -+ temp->g = (uint8_t)ScaleQuantumToChar(GetPixelGreen(pattern, pixel_quantum)); -+ temp->b = (uint8_t)ScaleQuantumToChar(GetPixelBlue(pattern, pixel_quantum)); - temp->next=NULL; - - if (pixel_last == NULL){ -@@ -274,6 +273,7 @@ - pixel_last = temp; - } - } -+ pixel_quantum += GetPixelChannels(pattern); - } - - if (verbose) -@@ -297,7 +297,7 @@ - fclose(compare[instance]->results); - free(compare[instance]); - } -- DestroyMagick(); -+ MagickCoreTerminus(); - compare[instance]=NULL; - - return(0); ---- transcode-1.1.7/filter/filter_logoaway.c -+++ transcode-1.1.7/filter/filter_logoaway.c -@@ -70,7 +70,7 @@ - - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ --#include <magick/api.h> -+#include <MagickCore/MagickCore.h> - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME - #undef PACKAGE_STRING -@@ -103,10 +103,10 @@ - - int alpha; - -- ExceptionInfo exception_info; -+ ExceptionInfo *exception_info; - Image *image; - ImageInfo *image_info; -- PixelPacket *pixel_packet; -+ Quantum *pixel_packet; - - int dump; - char *dump_buf; -@@ -174,7 +174,7 @@ - * instance filter instance - * @return void nothing - *********************************************************/ --static void work_with_rgb_frame(logoaway_data *LD, char *buffer, int width, int height) -+static void work_with_rgb_frame(logoaway_data *LD, unsigned char *buffer, int width, int height) - { - int row, col, i; - int xdistance, ydistance, distance_west, distance_north; -@@ -201,10 +201,10 @@ - } - } - -- LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, &LD->exception_info); -+ LD->dumpimage = ConstituteImage(LD->width-LD->xpos, LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, LD->exception_info); - tc_snprintf(LD->dumpimage->filename, MaxTextExtent, "dump[%d].png", LD->id); - -- WriteImage(LD->dumpimage_info, LD->dumpimage); -+ WriteImage(LD->dumpimage_info, LD->dumpimage, LD->exception_info); - } - - switch(LD->mode) { -@@ -218,27 +218,28 @@ - for(row=LD->ypos; row<LD->height; ++row) { - for(col=LD->xpos; col<LD->width; ++col) { - -+ Quantum *pixel = LD->pixel_packet + (row*LD->width+col)*GetPixelChannels(LD->image); - buf_off = ((height-row)*width+col) * 3; - pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos); - /* R */ - if (!LD->alpha) { - buffer[buf_off +0] = LD->rcolor; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], LD->rcolor, alpha_px); - } - /* G */ - if (!LD->alpha) { - buffer[buf_off +1] = LD->gcolor; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel)); - buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], LD->gcolor, alpha_px); - } - /* B */ - if (!LD->alpha) { - buffer[buf_off +2] = LD->bcolor; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].blue); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel)); - buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], LD->bcolor, alpha_px); - } - } -@@ -268,6 +269,7 @@ - buf_off = ((height-row)*width+col) * 3; - - pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos); -+ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image); - - /* R */ - hcalc = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width +0], alpha_hori); -@@ -276,7 +278,7 @@ - if (!LD->alpha) { - buffer[buf_off +0] = new_px; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], new_px, alpha_px); - } - /* G */ -@@ -286,7 +288,7 @@ - if (!LD->alpha) { - buffer[buf_off +1] = new_px; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel)); - buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], new_px, alpha_px); - } - /* B */ -@@ -296,7 +298,7 @@ - if (!LD->alpha) { - buffer[buf_off +2] = new_px; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel)); - buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], new_px, alpha_px); - } - } -@@ -327,28 +329,28 @@ - buf_off_height = ((height-LD->height)*width+col) * 3; - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col-i>LD->xpos)) - i++; - buf_off_xpos = ((height-row)*width + col-i) * 3; - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col+i<LD->width)) - i++; - buf_off_width = ((height-row)*width + col+i) * 3; - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row-i>LD->ypos)) - i++; - buf_off_ypos = (height*width*3)-((row-i)*width - col) * 3; - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row+i<LD->height)) - i++; - buf_off_height = (height*width*3)-((row+i)*width - col) * 3; - -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image))); - /* R */ - hcalc = alpha_blending(buffer[buf_off_xpos +0], buffer[buf_off_width +0], alpha_hori); - vcalc = alpha_blending(buffer[buf_off_ypos +0], buffer[buf_off_height +0], alpha_vert); -@@ -405,7 +407,7 @@ - * instance filter instance - * @return void nothing - *********************************************************/ --static void work_with_yuv_frame(logoaway_data *LD, char *buffer, int width, int height) -+static void work_with_yuv_frame(logoaway_data *LD, unsigned char *buffer, int width, int height) - { - int row, col, i; - int craddr, cbaddr; -@@ -431,10 +433,11 @@ - - buf_off = row*width+col; - pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos); -+ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image); - if (!LD->alpha) { - buffer[buf_off] = LD->ycolor; - } else { -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - buffer[buf_off] = alpha_blending(buffer[buf_off], LD->ycolor, alpha_px); - } - } -@@ -446,8 +449,9 @@ - - buf_off = row*width/2+col; - pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos); -+ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image); - /* sic */ -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - if (!LD->alpha) { - buffer[craddr + buf_off] = LD->ucolor; - buffer[cbaddr + buf_off] = LD->vcolor; -@@ -483,10 +487,11 @@ - buf_off_height = LD->height*width+col; - - pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos); -+ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image); - - hcalc = alpha_blending(buffer[buf_off_xpos], buffer[buf_off_width], alpha_hori); - vcalc = alpha_blending(buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert); -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100; - if (!LD->alpha) { - buffer[buf_off] = new_px; -@@ -517,7 +522,8 @@ - buf_off_height = LD->height/2*width/2+col; - - pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos); -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ Quantum *pixel = LD->pixel_packet + pkt_off*GetPixelChannels(LD->image); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, pixel)); - /* sic, reuse red alpha_px */ - - hcalc = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width], alpha_hori); -@@ -560,30 +566,30 @@ - pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos); - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col-i>LD->xpos)) - i++; - buf_off_xpos = (row*width + col-i); - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col+i<LD->width)) - i++; - buf_off_width = (row*width + col+i); - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row-i>LD->ypos)) - i++; - buf_off_ypos = ((row-i)*width + col); - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row+i<LD->height)) - i++; - buf_off_height = ((row+i)*width + col); - - hcalc = alpha_blending( buffer[buf_off_xpos], buffer[buf_off_width], alpha_hori ); - vcalc = alpha_blending( buffer[buf_off_ypos], buffer[buf_off_height], alpha_vert ); -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image))); - new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100; - buffer[buf_off] = alpha_blending(buffer[buf_off], new_px, alpha_px); - } -@@ -603,23 +609,23 @@ - alpha_hori = xdistance * distance_west; - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col-i>LD->xpos)) - i++; - buf_off_xpos = (row*width/2 + col-i); - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (col+i<LD->width)) - i++; - buf_off_width = (row*width/2 + col+i); - - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row-i>LD->ypos)) - i++; - buf_off_ypos = ((row-i)*width/2 + col); - i = 0; -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + (pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image))); - while ((alpha_px != 255) && (row+i<LD->height)) - i++; - buf_off_height = ((row+i)*width/2 + col); -@@ -630,7 +636,7 @@ - - pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + (col*2-LD->xpos); - -- alpha_px = (uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); -+ alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, LD->pixel_packet + pkt_off*GetPixelChannels(LD->image))); - /* sic: reuse the red component */ - hcalc = alpha_blending(buffer[craddr + buf_off_xpos], buffer[craddr + buf_off_width], alpha_hori); - vcalc = alpha_blending(buffer[craddr + buf_off_ypos], buffer[craddr + buf_off_height], alpha_vert); -@@ -815,17 +821,17 @@ - } - - if((data[instance]->alpha) || (data[instance]->dump)) { -- InitializeMagick(""); -- GetExceptionInfo(&data[instance]->exception_info); -+ MagickCoreGenesis("", MagickFalse); -+ data[instance]->exception_info = AcquireExceptionInfo(); - - if(data[instance]->alpha) { - data[instance]->image_info = CloneImageInfo((ImageInfo *) NULL); - - strlcpy(data[instance]->image_info->filename, data[instance]->file, MaxTextExtent); -- data[instance]->image = ReadImage(data[instance]->image_info, &data[instance]->exception_info); -+ data[instance]->image = ReadImage(data[instance]->image_info, data[instance]->exception_info); - if (data[instance]->image == (Image *) NULL) { - tc_log_error(MOD_NAME, "\n"); -- MagickWarning (data[instance]->exception_info.severity, data[instance]->exception_info.reason, data[instance]->exception_info.description); -+ MagickWarning (data[instance]->exception_info->severity, data[instance]->exception_info->reason, data[instance]->exception_info->description); - return TC_ERROR; - } - -@@ -835,7 +841,7 @@ - return TC_ERROR; - } - -- data[instance]->pixel_packet = GetImagePixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows); -+ data[instance]->pixel_packet = GetAuthenticPixels(data[instance]->image, 0, 0, data[instance]->image->columns, data[instance]->image->rows, data[instance]->exception_info); - } - if(data[instance]->dump) { - if((data[instance]->dump_buf = tc_malloc ((data[instance]->width-data[instance]->xpos)*(data[instance]->height-data[instance]->ypos)*3)) == NULL) -@@ -865,10 +871,9 @@ - if (data[instance]->dumpimage != (Image *)NULL) { - DestroyImage(data[instance]->dumpimage); - DestroyImageInfo(data[instance]->dumpimage_info); -- ConstituteComponentTerminus(); - } -- DestroyExceptionInfo(&data[instance]->exception_info); -- DestroyMagick(); -+ DestroyExceptionInfo(data[instance]->exception_info); -+ MagickCoreTerminus(); - - if(data[instance]->dump_buf) free(data[instance]->dump_buf); - if(data[instance]) free(data[instance]); ---- transcode-1.1.7/filter/filter_logo.c -+++ transcode-1.1.7/filter/filter_logo.c -@@ -36,7 +36,7 @@ - - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ --#include <magick/api.h> -+#include <MagickCore/MagickCore.h> - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME - #undef PACKAGE_STRING -@@ -227,7 +227,8 @@ - ImageFormat ifmt, - int do_rgbswap) - { -- PixelPacket *pixel_packet; -+ ExceptionInfo *exception_info; -+ Quantum *pixel_packet; - uint8_t *dst_ptr = dst; - - int row, col; -@@ -246,16 +247,17 @@ - } - g_off = 1; - -- pixel_packet = GetImagePixels(src, 0, 0, width, height); -+ exception_info = AcquireExceptionInfo(); -+ pixel_packet = GetAuthenticPixels(src, 0, 0, width, height, exception_info); - - for (row = 0; row < height; row++) { - for (col = 0; col < width; col++) { -- *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->red); -- *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->green); -- *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(pixel_packet->blue); -+ *(dst_ptr + r_off) = (uint8_t)ScaleQuantumToChar(GetPixelRed(src, pixel_packet)); -+ *(dst_ptr + g_off) = (uint8_t)ScaleQuantumToChar(GetPixelGreen(src, pixel_packet)); -+ *(dst_ptr + b_off) = (uint8_t)ScaleQuantumToChar(GetPixelBlue(src, pixel_packet)); - - dst_ptr += 3; -- pixel_packet++; -+ pixel_packet += GetPixelChannels(src); - } - } - -@@ -310,7 +312,7 @@ - Image *timg; - Image *nimg; - ImageInfo *image_info; -- ExceptionInfo exception_info; -+ ExceptionInfo *exception_info; - - int rgb_off = 0; - -@@ -376,19 +378,19 @@ - * semaphore. - */ - magick_usecount++; -- if (!IsMagickInstantiated()) { -- InitializeMagick(""); -+ if (!IsMagickCoreInstantiated()) { -+ MagickCoreGenesis("", MagickFalse); - } - -- GetExceptionInfo(&exception_info); -+ exception_info = AcquireExceptionInfo(); - image_info = CloneImageInfo((ImageInfo *) NULL); - strlcpy(image_info->filename, mfd->file, MaxTextExtent); - -- mfd->image = ReadImage(image_info, &exception_info); -+ mfd->image = ReadImage(image_info, exception_info); - if (mfd->image == (Image *) NULL) { -- MagickWarning(exception_info.severity, -- exception_info.reason, -- exception_info.description); -+ MagickWarning(exception_info->severity, -+ exception_info->reason, -+ exception_info->description); - strlcpy(mfd->file, "/dev/null", PATH_MAX); - return 0; - } -@@ -413,11 +415,11 @@ - - while (mfd->images != (Image *)NULL) { - if (mfd->flip || flip) { -- timg = FlipImage(mfd->images, &exception_info); -+ timg = FlipImage(mfd->images, exception_info); - if (timg == (Image *) NULL) { -- MagickError(exception_info.severity, -- exception_info.reason, -- exception_info.description); -+ MagickError(exception_info->severity, -+ exception_info->reason, -+ exception_info->description); - return -1; - } - AppendImageToList(&nimg, timg); -@@ -573,7 +575,7 @@ - /* Set up image/video coefficient lookup tables */ - if (img_coeff_lookup[0] < 0) { - int i; -- float maxrgbval = (float)MaxRGB; // from ImageMagick -+ float maxrgbval = (float)QuantumRange; // from ImageMagick - - for (i = 0; i <= MAX_UINT8_VAL; i++) { - float x = (float)ScaleCharToQuantum(i); -@@ -615,8 +617,8 @@ - } - - magick_usecount--; -- if (magick_usecount == 0 && IsMagickInstantiated()) { -- DestroyMagick(); -+ if (magick_usecount == 0 && IsMagickCoreInstantiated()) { -+ MagickCoreTerminus(); - } - - return 0; -@@ -638,7 +640,8 @@ - && (ptr->tag & TC_VIDEO) - && !(ptr->attributes & TC_FRAME_IS_SKIPPED) - ) { -- PixelPacket *pixel_packet; -+ ExceptionInfo *exception_info; -+ Quantum *pixel_packet; - uint8_t *video_buf; - - int do_fade = 0; -@@ -647,6 +650,7 @@ - - /* Note: ImageMagick defines opacity = 0 as fully visible, and - * opacity = MaxRGB as fully transparent. -+ * alpha rather than opacity (0 transparent; QuantumRange opaque). - */ - Quantum opacity; - -@@ -682,9 +686,11 @@ - mfd->cur_delay = mfd->images->delay * vob->fps/100; - } - -- pixel_packet = GetImagePixels(mfd->images, 0, 0, -+ exception_info = AcquireExceptionInfo(); -+ pixel_packet = GetAuthenticPixels(mfd->images, 0, 0, - mfd->images->columns, -- mfd->images->rows); -+ mfd->images->rows, -+ exception_info); - - if (vob->im_v_codec == CODEC_RGB) { - unsigned long r_off, g_off, b_off; -@@ -702,30 +708,30 @@ - video_buf = ptr->video_buf + 3 * ((row + mfd->posy) * vob->ex_v_width + mfd->posx); - - for (col = 0; col < mfd->image->columns; col++) { -- opacity = pixel_packet->opacity; -+ opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet); - - if (do_fade) -- opacity += (Quantum)((MaxRGB - opacity) * fade_coeff); -+ opacity += (Quantum)((QuantumRange - opacity) * fade_coeff); - - if (opacity == 0) { -- *(video_buf + r_off) = ScaleQuantumToChar(pixel_packet->red); -- *(video_buf + g_off) = ScaleQuantumToChar(pixel_packet->green); -- *(video_buf + b_off) = ScaleQuantumToChar(pixel_packet->blue); -- } else if (opacity < MaxRGB) { -+ *(video_buf + r_off) = ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet)); -+ *(video_buf + g_off) = ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet)); -+ *(video_buf + b_off) = ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet)); -+ } else if (opacity < QuantumRange) { - unsigned char opacity_uchar = ScaleQuantumToChar(opacity); - img_coeff = img_coeff_lookup[opacity_uchar]; - vid_coeff = vid_coeff_lookup[opacity_uchar]; - - *(video_buf + r_off) = (uint8_t)((*(video_buf + r_off)) * vid_coeff) -- + (uint8_t)(ScaleQuantumToChar(pixel_packet->red) * img_coeff); -+ + (uint8_t)(ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet)) * img_coeff); - *(video_buf + g_off) = (uint8_t)((*(video_buf + g_off)) * vid_coeff) -- + (uint8_t)(ScaleQuantumToChar(pixel_packet->green) * img_coeff); -+ + (uint8_t)(ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet)) * img_coeff); - *(video_buf + b_off) = (uint8_t)((*(video_buf + b_off)) * vid_coeff) -- + (uint8_t)(ScaleQuantumToChar(pixel_packet->blue) * img_coeff); -+ + (uint8_t)(ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet)) * img_coeff); - } - - video_buf += 3; -- pixel_packet++; -+ pixel_packet += GetPixelChannels(mfd->images); - } - } - } else { /* !RGB */ -@@ -745,10 +751,10 @@ - vid_pixel_V = vid_pixel_U + vid_size/4; - for (col = 0; col < mfd->images->columns; col++) { - int do_UV_pixels = (mfd->grayout == 0 && !(row % 2) && !(col % 2)) ? 1 : 0; -- opacity = pixel_packet->opacity; -+ opacity = QuantumRange - GetPixelAlpha(mfd->images, pixel_packet); - - if (do_fade) -- opacity += (Quantum)((MaxRGB - opacity) * fade_coeff); -+ opacity += (Quantum)((QuantumRange - opacity) * fade_coeff); - - if (opacity == 0) { - *vid_pixel_Y = *img_pixel_Y; -@@ -756,7 +762,7 @@ - *vid_pixel_U = *img_pixel_U; - *vid_pixel_V = *img_pixel_V; - } -- } else if (opacity < MaxRGB) { -+ } else if (opacity < QuantumRange) { - unsigned char opacity_uchar = ScaleQuantumToChar(opacity); - img_coeff = img_coeff_lookup[opacity_uchar]; - vid_coeff = vid_coeff_lookup[opacity_uchar]; ---- transcode-1.1.7/import/import_im.c -+++ transcode-1.1.7/import/import_im.c -@@ -34,9 +34,9 @@ - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ - #ifdef HAVE_BROKEN_WAND --#include <wand/magick-wand.h> -+#include <MagickWand/MagickWand.h> - #else /* we have a SANE wand header */ --#include <wand/MagickWand.h> -+#include <MagickWand/MagickWand.h> - #endif /* HAVE_BROKEN_WAND */ - - #undef PACKAGE_BUGREPORT ---- transcode-1.1.7/import/import_imlist.c -+++ transcode-1.1.7/import/import_imlist.c -@@ -34,9 +34,9 @@ - /* Note: because of ImageMagick bogosity, this must be included first, so - * we can undefine the PACKAGE_* symbols it splats into our namespace */ - #ifdef HAVE_BROKEN_WAND --#include <wand/magick-wand.h> -+#include <MagickWand/MagickWand.h> - #else /* we have a SANE wand header */ --#include <wand/MagickWand.h> -+#include <MagickWand/MagickWand.h> - #endif /* HAVE_BROKEN_WAND */ - - #undef PACKAGE_BUGREPORT ---- transcode-1.1.7/import/probe_im.c -+++ transcode-1.1.7/import/probe_im.c -@@ -40,9 +40,9 @@ - # undef PACKAGE_VERSION - - # ifdef HAVE_BROKEN_WAND --# include <wand/magick-wand.h> -+# include <MagickWand/MagickWand.h> - # else /* we have a SANE wand header */ --# include <wand/MagickWand.h> -+# include <MagickWand/MagickWand.h> - # endif /* HAVE_BROKEN_WAND */ - - # undef PACKAGE_BUGREPORT

1 0

ports/contrib (3.7): libglade-compat: dropped
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit f6ac9aef1f8ec9903bf0a1b104f47864f8e6be03 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 17:46:22 2022 +0000 libglade-compat: dropped diff --git a/libglade-compat/.footprint b/libglade-compat/.footprint deleted file mode 100644 index 7414609ed..000000000 --- a/libglade-compat/.footprint +++ /dev/null @@ -1,25 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/libglade-compat/ -drwxr-xr-x root/root usr/include/libglade-compat/libglade-2.0/ -drwxr-xr-x root/root usr/include/libglade-compat/libglade-2.0/glade/ --rw-r--r-- root/root usr/include/libglade-compat/libglade-2.0/glade/glade-build.h --rw-r--r-- root/root usr/include/libglade-compat/libglade-2.0/glade/glade-init.h --rw-r--r-- root/root usr/include/libglade-compat/libglade-2.0/glade/glade-parser.h --rw-r--r-- root/root usr/include/libglade-compat/libglade-2.0/glade/glade-xml.h --rw-r--r-- root/root usr/include/libglade-compat/libglade-2.0/glade/glade.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/libglade-compat/ --rw-r--r-- root/root usr/lib/libglade-compat/libglade-2.0.a --rwxr-xr-x root/root usr/lib/libglade-compat/libglade-2.0.la -lrwxrwxrwx root/root usr/lib/libglade-compat/libglade-2.0.so -> libglade-2.0.so.0.0.7 -lrwxrwxrwx root/root usr/lib/libglade-compat/libglade-2.0.so.0 -> libglade-2.0.so.0.0.7 --rwxr-xr-x root/root usr/lib/libglade-compat/libglade-2.0.so.0.0.7 -drwxr-xr-x root/root usr/lib/libglade-compat/pkgconfig/ --rw-r--r-- root/root usr/lib/libglade-compat/pkgconfig/libglade-2.0.pc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/xml/ -drwxr-xr-x root/root usr/share/xml/dtd/ -drwxr-xr-x root/root usr/share/xml/dtd/libglade/ -drwxr-xr-x root/root usr/share/xml/dtd/libglade/2.0/ diff --git a/libglade-compat/.signature b/libglade-compat/.signature deleted file mode 100644 index fbb8e8342..000000000 --- a/libglade-compat/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32/50d55t63mto1kn3yoYQsvXqYmgzR6Y+A2R3kXnTy5+yjZ2sQ6hKc3gfflgssxNUdR9sXMrsjV5K+xwVNCHAM= -SHA256 (Pkgfile) = 9a73e2a23c19d84e86cc5942cf53f1a18322916d3a9c642072a0d0d3940d6d6e -SHA256 (.footprint) = 3d4728386e3c3c5ca64368a2c62a7b1bba72bed8f18938a79fceff03216d34a2 -SHA256 (libglade-2.6.4.tar.bz2) = 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec -SHA256 (libglade-2.0.1-nowarning.patch) = 423c12af1c73442caa851a0b8db33b00fa4b778b1b422a4e8ac33d121d043008 diff --git a/libglade-compat/Pkgfile b/libglade-compat/Pkgfile deleted file mode 100644 index 9af184439..000000000 --- a/libglade-compat/Pkgfile +++ /dev/null @@ -1,39 +0,0 @@ -# Description: library to load glade interface files in a program at runtime -# URL: http://glade.gnome.org/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: libglade pango-compat - -name=libglade-compat -version=2.6.4 -release=1 -source=(http://download.gnome.org/sources/libglade/2.6/libglade-$version.tar.bz2 - libglade-2.0.1-nowarning.patch) - -build() { - cd libglade-$version - - sed -i -e 's/USE_NLS=yes/USE_NLS=no/' \ - -e 's/ENABLE_NLS 1/ENABLE_NLS 0/' configure - - sed -i -e "s|/etc/xml/catalog|$PKG/etc/xml/dtd/libglade/2.0/catalog|" \ - -e 's|$(datadir)/xml/libglade|$(datadir)/xml/dtd/libglade/2.0|' Makefile.in - - patch -p1 -i $SRC/libglade-2.0.1-nowarning.patch - - PKG_CONFIG_PATH+="/usr/lib/pango-compat/pkgconfig" \ - ./configure \ - --prefix=/usr \ - --includedir='/usr/include/libglade-compat' \ - --libdir='/usr/lib/libglade-compat' \ - --disable-debug \ - --disable-gtk-doc - - make - make DESTDIR=$PKG install - - rm -rf $PKG/usr/share/gtk-doc - - rm \ - $PKG/usr/bin/libglade-convert \ - $PKG/usr/share/xml/dtd/libglade/2.0/glade-2.0.dtd -} diff --git a/libglade-compat/libglade-2.0.1-nowarning.patch b/libglade-compat/libglade-2.0.1-nowarning.patch deleted file mode 100644 index fd071215f..000000000 --- a/libglade-compat/libglade-2.0.1-nowarning.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400 -+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400 -@@ -639,9 +639,8 @@ - if (!strcmp (childinfo->properties[j].name, "label")) { - label = childinfo->properties[j].value; - break; -- } else { -- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name); - } -+ /* Ignore all other properties */ - } - - if (label) { -@@ -683,6 +682,7 @@ - char *icon = NULL; - gboolean use_stock = FALSE, active = FALSE, new_group = FALSE; - gboolean use_underline = FALSE; -+ gboolean sensitive = TRUE; - GtkWidget *iconw = NULL; - int j; - -@@ -708,6 +708,8 @@ - group_name = value; - } else if (!strcmp (name, "new_group")) { - new_group = BOOL (value); -+ } else if (!strcmp (name, "sensitive")) { -+ sensitive = BOOL (value); - } else if (!strcmp (name, "visible")) { - /* ignore for now */ - } else if (!strcmp (name, "tooltip")) { -@@ -785,6 +787,8 @@ - gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label), - TRUE); - } -+ -+ gtk_widget_set_sensitive (child, sensitive); - - glade_xml_set_common_params (xml, child, childinfo->child); - } else {

1 0

ports/contrib (3.7): libfm: dropped gtk dependency, added vala
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit abb532e188ee311343d10ad27ea8b4cacb418a64 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 17:45:26 2022 +0000 libfm: dropped gtk dependency, added vala diff --git a/libfm/.footprint b/libfm/.footprint index dd20c5999..f28a8c6cc 100644 --- a/libfm/.footprint +++ b/libfm/.footprint @@ -76,11 +76,6 @@ drwxr-xr-x root/root usr/include/libfm/ -rw-r--r-- root/root usr/include/libfm/fm-utils.h -rw-r--r-- root/root usr/include/libfm/fm.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libfm-gtk.a --rwxr-xr-x root/root usr/lib/libfm-gtk.la -lrwxrwxrwx root/root usr/lib/libfm-gtk.so -> libfm-gtk.so.4.1.3 -lrwxrwxrwx root/root usr/lib/libfm-gtk.so.4 -> libfm-gtk.so.4.1.3 --rwxr-xr-x root/root usr/lib/libfm-gtk.so.4.1.3 -rw-r--r-- root/root usr/lib/libfm-gtk3.a -rwxr-xr-x root/root usr/lib/libfm-gtk3.la lrwxrwxrwx root/root usr/lib/libfm-gtk3.so -> libfm-gtk3.so.4.1.3 @@ -100,7 +95,6 @@ drwxr-xr-x root/root usr/lib/libfm/modules/ -rwxr-xr-x root/root usr/lib/libfm/modules/vfs-menu.so -rwxr-xr-x root/root usr/lib/libfm/modules/vfs-search.so drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libfm-gtk.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfm-gtk3.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfm.pc drwxr-xr-x root/root usr/share/ diff --git a/libfm/.signature b/libfm/.signature index 36747497b..6400a01af 100644 --- a/libfm/.signature +++ b/libfm/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/QNhbGM8xdg9+UpNUXFOGE9roKot9x6nZ1CR6W4dWir9fgq6x4AGtu+nW0kxQbjQlJw/2inSKL8NrQi2813Lg0= -SHA256 (Pkgfile) = 1da1ea77348a55681c65531f7dc801111cb4ecc0675f0dd8b3809c3fb98a5b7c -SHA256 (.footprint) = fc655dd07430e96baca62c9b582dddd1cb8e0139443ea320f5105b8e1ecb6ca0 +RWSagIOpLGJF36vNGLX0d7TbmYygknUR/YFiWF8tASIevUJ6uiawgxRDMiiZnYhncpVi4JVdtalK/XFYoWfZhmS0z37QuB4Q7Ak= +SHA256 (Pkgfile) = 41a8538865995d1a0768f3256e15a23a5ddc42c3309c13eb6e8c4758882a5c6d +SHA256 (.footprint) = 2e17e39f4d006c337e0cfa49aae9cdb2bd76b4fe7397816a93a7db317ba744c9 SHA256 (libfm-1.3.2.tar.xz) = a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5 diff --git a/libfm/Pkgfile b/libfm/Pkgfile index 10c037c02..bf541eb79 100644 --- a/libfm/Pkgfile +++ b/libfm/Pkgfile @@ -1,31 +1,16 @@ # Description: Library for file management. # URL: https://wiki.lxde.org/en/PCManFM # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gtk gtk3 menu-cache xorg-libxdamage libfm-extra -# Optional: dbus-glib gvfs vala libexif +# Depends on: gtk3 libfm-extra menu-cache vala xorg-libxdamage +# Optional: dbus-glib gtk gvfs libexif name=libfm version=1.3.2 -release=2 +release=3 source=(https://downloads.sourceforge.net/pcmanfm/$name-$version.tar.xz) build() { - cp -r $name-$version gtk3 - cp -r $name-$version gtk2 - - cd $SRC/gtk2 - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-gnu-ld \ - --disable-nls \ - --disable-gtk-doc-html - - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make - make DESTDIR=$PKG install + cp -r $SRC/$name-$version $SRC/gtk3 cd $SRC/gtk3 ./configure \ @@ -39,6 +24,27 @@ build() { make make DESTDIR=$PKG install + cd $SRC + + if prt-get isinst gtk; then + cp -r $SRC/$name-$version $SRC/gtk2 + + cd $SRC/gtk2 + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-gnu-ld \ + --disable-nls \ + --disable-gtk-doc-html + + # https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make + make DESTDIR=$PKG install + cd $SRC + fi + rm -r $PKG/usr/share/locale rm -r $PKG/usr/include/libfm

1 0

ports/contrib (3.7): thunderbird: dropped gtk dependency, added xorg-libxcomposite xorg-libxcursor
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 707ac5e3fa60f10ebc4285ccafb6b1ed9fb94772 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 17:26:13 2022 +0000 thunderbird: dropped gtk dependency, added xorg-libxcomposite xorg-libxcursor diff --git a/thunderbird/.signature b/thunderbird/.signature index 7c09173cd..079d8e3f8 100644 --- a/thunderbird/.signature +++ b/thunderbird/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3w4D0l6ckJk63rHwkc8IoO6BbiNn6v66KeWrXGjZEIs6+rPR8QnXjdYFdsyab6D2k6qeNXhCUrDP4d2E3RN/KwY= -SHA256 (Pkgfile) = f8af4291c0701b2006a7a1f98cc3728d691db205d0000492a86a64ec50259014 +RWSagIOpLGJF3zvxr/BjLJR+gGX+/AycwL8W3IBMX4Il8/AG+3co2CETBMSrH8UJAOBXAyzZeH6ZXroFsjsV6ivTOoPXM6tj4wM= +SHA256 (Pkgfile) = 7a81eeba0936b3f68a869c9354990b92f18af13f68105952788e7eeef99d04f4 SHA256 (.footprint) = b4b411c70602919b2afe6fbf140755bd53ad1f77d2ff5013a899e0a3cf4543d2 SHA256 (thunderbird-102.4.2.source.tar.xz) = ffc4a0499ccef41dccd99a683715199e9c839d628240dfb4b5f52bf1e6c902d5 SHA256 (thunderbird.desktop) = c6bc6a66f16951c4f7560d019dad48968169aef6587cef4e98380a300078299a diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 3a44eb632..e0d011df5 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,7 +1,7 @@ # Description: Email client from the Mozilla project # URL: https://www.thunderbird.net/en-US/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg gtk libevent libidl libnotify libvpx libwebp lld nodejs nss startup-notification unzip wasi-libc++ zip +# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg libevent libidl libnotify libvpx libwebp lld nodejs nss startup-notification unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor zip # Optional: sccache name=thunderbird

1 0

ports/contrib (3.7): libcanberra: made gtk optional
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 1b85359f5df81df49aeb8fc0034f6f1e2474b933 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 16:21:19 2022 +0000 libcanberra: made gtk optional diff --git a/libcanberra/.footprint b/libcanberra/.footprint index 05f1419f9..20aff0d8e 100644 --- a/libcanberra/.footprint +++ b/libcanberra/.footprint @@ -6,10 +6,6 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/canberra-gtk.h -rw-r--r-- root/root usr/include/canberra.h drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/gtk-2.0/ -drwxr-xr-x root/root usr/lib/gtk-2.0/modules/ --rwxr-xr-x root/root usr/lib/gtk-2.0/modules/libcanberra-gtk-module.la --rwxr-xr-x root/root usr/lib/gtk-2.0/modules/libcanberra-gtk-module.so drwxr-xr-x root/root usr/lib/gtk-3.0/ drwxr-xr-x root/root usr/lib/gtk-3.0/modules/ lrwxrwxrwx root/root usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so -> libcanberra-gtk3-module.so @@ -22,10 +18,6 @@ drwxr-xr-x root/root usr/lib/libcanberra-0.30/ -rwxr-xr-x root/root usr/lib/libcanberra-0.30/libcanberra-multi.so -rwxr-xr-x root/root usr/lib/libcanberra-0.30/libcanberra-null.la -rwxr-xr-x root/root usr/lib/libcanberra-0.30/libcanberra-null.so --rwxr-xr-x root/root usr/lib/libcanberra-gtk.la -lrwxrwxrwx root/root usr/lib/libcanberra-gtk.so -> libcanberra-gtk.so.0.1.9 -lrwxrwxrwx root/root usr/lib/libcanberra-gtk.so.0 -> libcanberra-gtk.so.0.1.9 --rwxr-xr-x root/root usr/lib/libcanberra-gtk.so.0.1.9 -rwxr-xr-x root/root usr/lib/libcanberra-gtk3.la lrwxrwxrwx root/root usr/lib/libcanberra-gtk3.so -> libcanberra-gtk3.so.0.1.9 lrwxrwxrwx root/root usr/lib/libcanberra-gtk3.so.0 -> libcanberra-gtk3.so.0.1.9 @@ -35,7 +27,6 @@ lrwxrwxrwx root/root usr/lib/libcanberra.so -> libcanberra.so.0.2.5 lrwxrwxrwx root/root usr/lib/libcanberra.so.0 -> libcanberra.so.0.2.5 -rwxr-xr-x root/root usr/lib/libcanberra.so.0.2.5 drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libcanberra-gtk.pc -rw-r--r-- root/root usr/lib/pkgconfig/libcanberra-gtk3.pc -rw-r--r-- root/root usr/lib/pkgconfig/libcanberra.pc drwxr-xr-x root/root usr/share/ diff --git a/libcanberra/.signature b/libcanberra/.signature index 0e87bb60c..9e1101a66 100644 --- a/libcanberra/.signature +++ b/libcanberra/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/VqHQplprAKA/wfKbClr7bi9HMDOQ5m2H+nL+nlz+dVdg0Q+erY7aQe357PZrAlP1D0QWB3oFn6su18IGwSRQg= -SHA256 (Pkgfile) = 0894ae4b01ed678366c1aa099dcbdb3dd100e367f994baeb5923c05f41fba378 -SHA256 (.footprint) = a6bfc89d600feeb9fbcdfff0f8989e15b2d235f2017b16eae370a9c0ea798672 +RWSagIOpLGJF3yVU2Dx/zBs5hmyzkt/98bgxmJLz10t0B8LNRBFDsW6Kp1ZGzh5DGmYGIRL0eo8lQJM84e2+huL1QsJ1DVzGNw8= +SHA256 (Pkgfile) = 557f6f09e9d73cb81869833d2ce17647f90bec45984e143d47a22487768f0c3d +SHA256 (.footprint) = 7ef21f7e505d952a52fe33ef7713bf2a7f8b76d6fd9e36d6a7bdff7d5b1ab342 SHA256 (libcanberra-0.30.tar.xz) = c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 SHA256 (libcanberra-broadway-fix.patch) = 5c07bf6a7199d992e6f797de157bf4368391e597ab7a332da401269a8d8dd12b SHA256 (libcanberra-multi-backend.patch) = de146cae3e40a16b38c8edb4f1a3a423c64eb9c5000e36c316b677e9909c9b06 diff --git a/libcanberra/Pkgfile b/libcanberra/Pkgfile index 6d19070b7..c5ac34352 100644 --- a/libcanberra/Pkgfile +++ b/libcanberra/Pkgfile @@ -1,8 +1,8 @@ # Description: A small and lightweight implementation of the XDG Sound Theme Specification # URL: http://0pointer.de/lennart/projects/libcanberra # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: alsa-lib gtk gtk3 libvorbis -# Optional: gstreamer pulseaudio tdb +# Depends on: alsa-lib gtk3 libvorbis +# Optional: gstreamer gtk pulseaudio tdb lynx name=libcanberra version=0.30 @@ -15,7 +15,7 @@ build() { patch -p1 -i $SRC/libcanberra-broadway-fix.patch patch -p1 -i $SRC/libcanberra-multi-backend.patch - ./configure --prefix=/usr \ + ./configure --prefix=/usr $PKGMK_LIBCANBERRA \ --enable-alsa \ --disable-oss \ --disable-static \

1 0

ports/contrib (3.7): inkscape: fixed build
by crux＠crux.nu 13 Nov '22

13 Nov '22

commit 10a2eb640c591542d6d0f5dee361043fcd42aa58 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Nov 13 16:19:30 2022 +0000 inkscape: fixed build diff --git a/inkscape/.footprint b/inkscape/.footprint index dfc23a21e..55ea3e11a 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -4208,8 +4208,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.tutorial-advanced.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.zh_CN.svg @@ -4238,8 +4238,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.tutorial-basic.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.zh_CN.svg @@ -4263,10 +4263,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.tutorial-calligraphy.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.de.svg @@ -4288,9 +4289,10 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.tutorial-elements.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.uk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.de.svg @@ -4305,10 +4307,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.pt_BR.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.sk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.tutorial-interpolate.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.de.svg @@ -4330,8 +4333,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.tutorial-shapes.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.zh_CN.svg @@ -4356,10 +4359,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.tutorial-tips.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.de.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.el.svg @@ -4371,9 +4375,10 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.pt_BR.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.tutorial-tracing-pixelart.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.uk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.de.svg @@ -4394,10 +4399,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.tutorial-tracing.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tux.png drwxr-xr-x root/root usr/share/inkscape/ui/ diff --git a/inkscape/.signature b/inkscape/.signature index 81e8cd483..0758bf813 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wU2L/4bYLCn3HOPpd2EQvv07FCalkev/0iaoSZjy/xAv1ocfvLp8COUxWXCruu5lD1rn0A4/CDO50Auyvzn+gY= -SHA256 (Pkgfile) = 67e291813b6553ae19da01c292b4c4ee0b0e0cd63300674410fdd3554225cc63 -SHA256 (.footprint) = 1c24d3b5ba0c986a1b9f7dc00485cb6f433fe75ad2332bf4e12001e4ef454b6e -SHA256 (inkscape-1.2_2022-05-15_dc2aedaf03.tar.xz) = 8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad +RWSagIOpLGJF38PaOV7SSt23Xz8BarFh3+aESLPNXI6APT1BH9b47Gfd5MNSay0f7S1SiUf/UpUPte5L9ZANd4UD3SM1szlkVg8= +SHA256 (Pkgfile) = 934003e1692d951024ae8c6bdc238585a13eafdc8847e6943aa57a563f7618c3 +SHA256 (.footprint) = 50d4df1c4e5c01b01a53d984f35aad272b72f63502122f5926ccfc538d125258 +SHA256 (inkscape-1.2.1.tar.xz) = 46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b SHA256 (poppler-22.09.0.tar.xz) = d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e SHA256 (inkscape-1.2.1-poppler-22.09.0.patch) = 5e847d11c1c42db717ad39bc03708e3b855f0e0a99ee4ac8d97f5bfe4af8985c diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index 6212772f3..c34294366 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -10,7 +10,7 @@ _version=1.2_2022-05-15_dc2aedaf03 _pversion=22.09.0 _psoversion=124 release=2 -source=(https://media.inkscape.org/dl/resources/file/inkscape-$_version.tar.xz +source=(https://inkscape.org/gallery/item/34673/inkscape-1.2.1.tar.xz https://poppler.freedesktop.org/poppler-$_pversion.tar.xz inkscape-1.2.1-poppler-22.09.0.patch) @@ -41,18 +41,18 @@ poppler() { } build() { - #[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] && + #[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] && poppler # https://gitlab.com/inkscape/inkscape/-/merge_requests/4719 - patch -d $name-$_version -p1 -i $SRC/inkscape-1.2.1-poppler-22.09.0.patch + patch -d inkscape-1.2.1_2022-07-14_9c6d41e410 -p1 -i $SRC/inkscape-1.2.1-poppler-22.09.0.patch # https://gitlab.gnome.org/GNOME/glib/-/issues/2331 CFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape' CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape' export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape" - cmake -S $name-$_version -B build -G Ninja \ + cmake -S inkscape-1.2.1_2022-07-14_9c6d41e410 -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ @@ -73,4 +73,6 @@ build() { /usr/bin/python3 -mcompileall $PKG /usr/bin/python3 -O -m compileall $PKG /usr/bin/python3 -OO -m compileall $PKG + + rm -rf $PKG/usr/share/man/zh_TW }

1 0