Request 5287 (accepted)

Overview

Request 5287 (accepted)

- Update to git version 0.161+git20200912.d198931a
- Bump soversion to 161
- Drop x264-gpac10.patch (merged upstream)
- Switch default muxer/demuxer library to l-smash and make gpac
optional
- Add new update.sh helper script
- Enable lto via switch

Created by olh over 3 years ago
In state accepted

Submit libx264

Submit package Staging / libx264 to package Essentials / libx264

libx264-x264.changes Changed

libx264.changes Changed

libx264-x264.spec Changed

@@ -19,12 +19,12 @@
 
 %define _lto_cflags %{nil}
 # remember to adjust baselibs.conf
-%define soname  160
-%bcond_without  gpac
+%define sover   161
+%bcond_with     gpac
 ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
 %bcond_without  x264_binary
 Name:           libx264-x264
-Version:        0.160+git20200702.cde9a933
+Version:        0.161+git20200912.d198931a
 Release:        0
 Summary:        Command line tool for libx264
 License:        GPL-2.0-or-later
@@ -33,8 +33,6 @@
 Source:         x264-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch0:         x264-use-shared-library.patch
-# PATCH-FIX-UPSTREAM x264-gpac10.patch
-Patch1:         x264-gpac10.patch
 # PATCH_FIX-OPENSUSE x264-gpac_no_static.patch
 Patch2:         x264-gpac_no_static.patch
 BuildRequires:  nasm >= 2.13
@@ -43,6 +41,8 @@
 %if %{with x264_binary}
 %if %{with gpac}
 BuildRequires:  pkgconfig(gpac)
+%else
+BuildRequires:  pkgconfig(liblsmash)
 %endif
 BuildRequires:  pkgconfig(ffms2)
 BuildRequires:  pkgconfig(libavcodec)
@@ -77,11 +77,11 @@
 - Custom quantization matrices
 - Parallel encoding of multiple slices (currently disabled)
 
-%package %{soname}
+%package %{sover}
 Summary:        A free h264/avc encoder - encoder binary
 Group:          System/Libraries
 
-%description %{soname}
+%description %{sover}
 x264 is a free library for encoding next-generation H264/AVC video
 streams. The code is written from scratch by Laurent Aimar, Loren
 Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
@@ -107,7 +107,7 @@
 %package devel
 Summary:        Libraries and include file for the %{name} encoder
 Group:          Development/Libraries/C and C++
-Requires:       %{name}-%{soname} = %{version}
+Requires:       %{name}-%{sover} = %{version}
 Provides:       x264-devel = %{version}
 Obsoletes:      x264-devel < %{version}
 
@@ -126,11 +126,11 @@
 
 %build
 %configure \
-  --disable-lsmash \
   --disable-opencl \
   --enable-shared \
 %if %{with x264_binary}
 %if %{with gpac}
+  --disable-lsmash \
 %else
   --disable-gpac \
 %endif
@@ -139,8 +139,8 @@
   --disable-swscale \
   --disable-lavf \
   --disable-ffms \
-  --disable-gpac \
 %endif
+  --enable-lto \
   --enable-pic
 %make_build
 
@@ -152,7 +152,7 @@
 
 rm -f %{buildroot}%{_libdir}/%{name}.so
 rm -f %{buildroot}%{_libdir}/%{name}.a
-ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
+ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so
 %endif
 
 %if %{with x264_binary}
@@ -162,12 +162,12 @@
 %attr(0755,root,root) %{_bindir}/x264
 %else
 
-%post -n %{name}-%{soname} -p /sbin/ldconfig
-%postun -n %{name}-%{soname} -p /sbin/ldconfig
+%post -n %{name}-%{sover} -p /sbin/ldconfig
+%postun -n %{name}-%{sover} -p /sbin/ldconfig
 
-%files %{soname}
+%files %{sover}
 %defattr(0644,root,root)
-%{_libdir}/%{name}.so.%{soname}
+%{_libdir}/%{name}.so.%{sover}
 
 %files devel
 %defattr(0644,root,root)

libx264.spec Changed

@@ -19,11 +19,11 @@
 
 %define _lto_cflags %{nil}
 # remember to adjust baselibs.conf
-%define soname  160
-%bcond_without  gpac
+%define sover   161
+%bcond_with     gpac
 %bcond_with     x264_binary
 Name:           libx264
-Version:        0.160+git20200702.cde9a933
+Version:        0.161+git20200912.d198931a
 Release:        0
 Summary:        A free h264/avc encoder - encoder binary
 License:        GPL-2.0-or-later
@@ -32,8 +32,6 @@
 Source:         x264-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch0:         x264-use-shared-library.patch
-# PATCH-FIX-UPSTREAM x264-gpac10.patch
-Patch1:         x264-gpac10.patch
 # PATCH_FIX-OPENSUSE x264-gpac_no_static.patch
 Patch2:         x264-gpac_no_static.patch
 BuildRequires:  nasm >= 2.13
@@ -42,6 +40,8 @@
 %if %{with x264_binary}
 %if %{with gpac}
 BuildRequires:  pkgconfig(gpac)
+%else
+BuildRequires:  pkgconfig(liblsmash)
 %endif
 BuildRequires:  pkgconfig(ffms2)
 BuildRequires:  pkgconfig(libavcodec)
@@ -76,11 +76,11 @@
 - Custom quantization matrices
 - Parallel encoding of multiple slices (currently disabled)
 
-%package %{soname}
+%package %{sover}
 Summary:        A free h264/avc encoder - encoder binary
 Group:          System/Libraries
 
-%description %{soname}
+%description %{sover}
 x264 is a free library for encoding next-generation H264/AVC video
 streams. The code is written from scratch by Laurent Aimar, Loren
 Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
@@ -106,7 +106,7 @@
 %package devel
 Summary:        Libraries and include file for the %{name} encoder
 Group:          Development/Libraries/C and C++
-Requires:       %{name}-%{soname} = %{version}
+Requires:       %{name}-%{sover} = %{version}
 Provides:       x264-devel = %{version}
 Obsoletes:      x264-devel < %{version}
 
@@ -125,11 +125,11 @@
 
 %build
 %configure \
-  --disable-lsmash \
   --disable-opencl \
   --enable-shared \
 %if %{with x264_binary}
 %if %{with gpac}
+  --disable-lsmash \
 %else
   --disable-gpac \
 %endif
@@ -138,8 +138,8 @@
   --disable-swscale \
   --disable-lavf \
   --disable-ffms \
-  --disable-gpac \
 %endif
+  --enable-lto \
   --enable-pic
 %make_build
 
@@ -151,7 +151,7 @@
 
 rm -f %{buildroot}%{_libdir}/%{name}.so
 rm -f %{buildroot}%{_libdir}/%{name}.a
-ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
+ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so
 %endif
 
 %if %{with x264_binary}
@@ -161,12 +161,12 @@
 %attr(0755,root,root) %{_bindir}/x264
 %else
 
-%post -n %{name}-%{soname} -p /sbin/ldconfig
-%postun -n %{name}-%{soname} -p /sbin/ldconfig
+%post -n %{name}-%{sover} -p /sbin/ldconfig
+%postun -n %{name}-%{sover} -p /sbin/ldconfig
 
-%files %{soname}
+%files %{sover}
 %defattr(0644,root,root)
-%{_libdir}/%{name}.so.%{soname}
+%{_libdir}/%{name}.so.%{sover}
 
 %files devel
 %defattr(0644,root,root)

x264-gpac10.patch Deleted

@@ -1,48 +0,0 @@
-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
-     gpac="no"
-     GPAC_LIBS="-lgpac_static"
-     cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
-+    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 );
-     }
-

_service Changed

baselibs.conf Changed

update.sh Added

x264-0.160+git20200702.cde9a933.tar.xz Deleted

x264-0.161+git20200912.d198931a.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 5287 0

Request History

olh created request over 3 years ago

olh accepted request over 3 years ago