diff --git a/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff new file mode 100644 index 0000000..fd653bd --- /dev/null +++ b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff @@ -0,0 +1,48 @@ +diff --git a/configure b/configure +index 51c896e901c5d4bb3ac4408e005380f64fb8f230..78aa11404e414db6168aef920e7e6bdaf5636d7d 100755 +--- a/configure ++++ b/configure +@@ -1232,15 +1232,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then + for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do + cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib" + done ++ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl" + if [ "$SYS" = "WINDOWS" ] ; then + cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32" + cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm" + fi + if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then +- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then ++ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then + gpac="yes" + else +- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later" ++ echo "Warning: gpac is too old, update to v0.8.0 or later" + fi + fi + fi +diff --git a/output/mp4.c b/output/mp4.c +index 944e777113c4919520aeae131b542b9b2e0d3366..200cb33a9a19ae41c74f8b057cea3fdd0daf71af 100644 +--- a/output/mp4.c ++++ b/output/mp4.c +@@ -147,7 +147,11 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest + { + uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file ); + uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) ); ++#if GPAC_VERSION_MAJOR > 8 ++ gf_isom_append_edit( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL ); ++#else + gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL ); ++#endif + } + gf_isom_sample_del( &sample ); + +@@ -233,7 +237,7 @@ static int set_param( hnd_t handle, x264_param_t *p_param ) + dw *= sar; + else + dh /= sar; +- gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height ); ++ gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height, 0 ); + gf_isom_set_track_layout_info( p_mp4->p_file, p_mp4->i_track, dw, dh, 0, 0, 0 ); + } + diff --git a/x264-gpac.patch b/x264-gpac.patch index 3979342..e43bff0 100644 --- a/x264-gpac.patch +++ b/x264-gpac.patch @@ -5,7 +5,7 @@ gpac="no" GPAC_LIBS="-lgpac_static" - cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" -+ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do ++ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do + cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib" + done if [ "$SYS" = "WINDOWS" ] ; then diff --git a/x264.spec b/x264.spec index cfec720..099cc11 100644 --- a/x264.spec +++ b/x264.spec @@ -31,7 +31,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 8%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 9%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -43,6 +43,7 @@ Patch0: x264-nover.patch Patch1: x264-10b.patch Patch10: x264-gpac.patch Patch11: x264-opencl.patch +Patch12: 7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff BuildRequires: gcc %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel} @@ -100,6 +101,7 @@ pushd %{name}-0.%{api}-%{snapshot} %patch1 -p1 -b .10b %patch10 -p1 -b .gpac %patch11 -p1 -b .opencl +%patch12 -p1 -b .gpac8 popd variants="generic generic10" @@ -207,6 +209,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Mon Jul 06 2020 Sérgio Basto - 0.159-9.20200409git296494a +- Fix detection of gpac + * Wed Jun 10 2020 Sérgio Basto - 0.159-8.20200409git296494a - Update to 0.159-20200409git296494a (stable branch) - Replace all __make _smp_mflags by make_build macro