Hello community, here is the log from the commit of package ffmpeg-4 for openSUSE:Factory checked in at 2019-07-08 15:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old) and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpeg-4" Mon Jul 8 15:05:28 2019 rev:15 rq:713763 version:4.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2019-06-24 21:49:09.699910507 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.4615/ffmpeg-4.changes 2019-07-08 15:05:29.426939656 +0200 @@ -1,0 +2,15 @@ +Sat Jul 6 21:43:04 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Add pkgconfig(libva-drm), pkgconfig(libva-x11) BuildRequires: and + conditional pkgconfig(libmfx) BuildRequires: Build intel-mediasdk + support when possible. + +------------------------------------------------------------------- +Tue Jul 2 09:04:55 UTC 2019 - Ismail Dönmez <idonmez@suse.com> + +- Add back pkgconfig(fdk-aac) BuildRequires since we still need + the headers at compile time. +- Fix include paths in + ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg-4.spec ++++++ --- /var/tmp/diff_new_pack.O9em1j/_old 2019-07-08 15:05:31.610942958 +0200 +++ /var/tmp/diff_new_pack.O9em1j/_new 2019-07-08 15:05:31.646943013 +0200 @@ -165,6 +165,8 @@ BuildRequires: pkgconfig(libssh) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libva-drm) +BuildRequires: pkgconfig(libva-x11) BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libxml-2.0) %if %{with zmq} @@ -202,11 +204,19 @@ BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) +%if 0%{?suse_version} >= 1550 +%ifarch x86_64 +BuildRequires: pkgconfig(libmfx) +%endif +%endif %if %{with zimg} BuildRequires: pkgconfig(zimg) %endif BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 +%if %{with fdk_aac_dlopen} +BuildRequires: pkgconfig(fdk-aac) +%endif %if %{with librtmp} BuildRequires: pkgconfig(librtmp) %endif @@ -664,6 +674,11 @@ %if %{with lv2} --enable-lv2 \ %endif +%if 0%{?suse_version} >= 1550 +%ifarch x86_64 + --enable-libmfx \ +%endif +%endif --enable-vaapi \ --enable-vdpau \ %if %{with fdk_aac_dlopen} ++++++ ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch ++++++ --- /var/tmp/diff_new_pack.O9em1j/_old 2019-07-08 15:05:32.490944289 +0200 +++ /var/tmp/diff_new_pack.O9em1j/_new 2019-07-08 15:05:32.514944325 +0200 @@ -83,7 +83,7 @@ enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && warn "using libfdk without pkg-config"; } } -+enabled libfdk_aac_dlopen && enable libfdk_aac && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libfdk_aac_dlopen && enable libfdk_aac && add_cppflags "-I/usr/include/fdk-aac" flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled fontconfig && enable libfontconfig @@ -91,16 +91,16 @@ { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs -+enabled libmp3lame_dlopen && enable libmp3lame && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libmp3lame_dlopen && enable libmp3lame && add_cppflags "-I/usr/include/lame" enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load || require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; } enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei || check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc -lnppidei || die "ERROR: libnpp not found"; } enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb -+enabled libopencore_amrnb_dlopen && enable libopencore_amrnb && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libopencore_amrnb_dlopen && enable libopencore_amrnb && add_cppflags "-I/usr/include/opencore-amrnb" enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -+enabled libopencore_amrwb_dlopen && enable libopencore_amrwb && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libopencore_amrwb_dlopen && enable libopencore_amrwb && add_cppflags "-I/usr/include/opencore-amrwb" enabled libopencv && { check_headers opencv2/core/core_c.h && { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || @@ -108,14 +108,14 @@ warn "using libx264 without pkg-config"; } } && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && check_cpp_condition libx262 x264.h "X264_MPEG2" -+enabled libx264_dlopen && enable libx264 && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libx264_dlopen && enable libx264 enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 68" -+enabled libx265_dlopen && enable libx265 && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libx265_dlopen && enable libx265 enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.2.77" "stdint.h xavs2.h" xavs2_api_get enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore -+enabled libxvid_dlopen && enable libxvid && add_cppflags "-I$(dirname `readlink -f $0`)/localinc" ++enabled libxvid_dlopen && enable libxvid enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && @@ -141,7 +141,7 @@ =================================================================== --- ffmpeg-4.1.3.orig/libavcodec/libfdk-aacdec.c +++ ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c -@@ -37,6 +37,54 @@ +@@ -37,6 +39,54 @@ #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS #endif @@ -196,7 +196,7 @@ enum ConcealMethod { CONCEAL_METHOD_SPECTRAL_MUTING = 0, CONCEAL_METHOD_NOISE_SUBSTITUTION = 1, -@@ -224,6 +272,11 @@ static av_cold int fdk_aac_decode_init(A +@@ -224,6 +274,11 @@ static av_cold int fdk_aac_decode_init(A FDKAACDecContext *s = avctx->priv_data; AAC_DECODER_ERROR err;