Changes of Revision 10
libx264-x264.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Nov 28 14:21:00 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>4
+5
+- Update to git version 0.161+git20200912.d198931a6
+- Bump soversion to 1617
+- Drop x264-gpac10.patch (merged upstream)8
+- Switch default muxer/demuxer library to l-smash and make gpac9
+ optional10
+- Add new update.sh helper script11
+- Enable lto via switch12
+13
+-------------------------------------------------------------------14
Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>15
16
- Update to git version 0.160+git20200702.cde9a93317
libx264.changes
Changed
17
1
2
-------------------------------------------------------------------3
+Sat Nov 28 14:21:00 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>4
+5
+- Update to git version 0.161+git20200912.d198931a6
+- Bump soversion to 1617
+- Drop x264-gpac10.patch (merged upstream)8
+- Switch default muxer/demuxer library to l-smash and make gpac9
+ optional10
+- Add new update.sh helper script11
+- Enable lto via switch12
+13
+-------------------------------------------------------------------14
Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>15
16
- Update to git version 0.160+git20200702.cde9a93317
libx264-x264.spec
Changed
107
1
2
3
%define _lto_cflags %{nil}4
# remember to adjust baselibs.conf5
-%define soname 1606
-%bcond_without gpac7
+%define sover 1618
+%bcond_with gpac9
##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####10
%bcond_without x264_binary11
Name: libx264-x26412
-Version: 0.160+git20200702.cde9a93313
+Version: 0.161+git20200912.d198931a14
Release: 015
Summary: Command line tool for libx26416
License: GPL-2.0-or-later17
18
Source: x264-%{version}.tar.xz19
Source1: baselibs.conf20
Patch0: x264-use-shared-library.patch21
-# PATCH-FIX-UPSTREAM x264-gpac10.patch22
-Patch1: x264-gpac10.patch23
# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch24
Patch2: x264-gpac_no_static.patch25
BuildRequires: nasm >= 2.1326
27
%if %{with x264_binary}28
%if %{with gpac}29
BuildRequires: pkgconfig(gpac)30
+%else31
+BuildRequires: pkgconfig(liblsmash)32
%endif33
BuildRequires: pkgconfig(ffms2)34
BuildRequires: pkgconfig(libavcodec)35
36
- Custom quantization matrices37
- Parallel encoding of multiple slices (currently disabled)38
39
-%package %{soname}40
+%package %{sover}41
Summary: A free h264/avc encoder - encoder binary42
Group: System/Libraries43
44
-%description %{soname}45
+%description %{sover}46
x264 is a free library for encoding next-generation H264/AVC video47
streams. The code is written from scratch by Laurent Aimar, Loren48
Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans49
50
%package devel51
Summary: Libraries and include file for the %{name} encoder52
Group: Development/Libraries/C and C++53
-Requires: %{name}-%{soname} = %{version}54
+Requires: %{name}-%{sover} = %{version}55
Provides: x264-devel = %{version}56
Obsoletes: x264-devel < %{version}57
58
59
60
%build61
%configure \62
- --disable-lsmash \63
--disable-opencl \64
--enable-shared \65
%if %{with x264_binary}66
%if %{with gpac}67
+ --disable-lsmash \68
%else69
--disable-gpac \70
%endif71
72
--disable-swscale \73
--disable-lavf \74
--disable-ffms \75
- --disable-gpac \76
%endif77
+ --enable-lto \78
--enable-pic79
%make_build80
81
82
83
rm -f %{buildroot}%{_libdir}/%{name}.so84
rm -f %{buildroot}%{_libdir}/%{name}.a85
-ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so86
+ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so87
%endif88
89
%if %{with x264_binary}90
91
%attr(0755,root,root) %{_bindir}/x26492
%else93
94
-%post -n %{name}-%{soname} -p /sbin/ldconfig95
-%postun -n %{name}-%{soname} -p /sbin/ldconfig96
+%post -n %{name}-%{sover} -p /sbin/ldconfig97
+%postun -n %{name}-%{sover} -p /sbin/ldconfig98
99
-%files %{soname}100
+%files %{sover}101
%defattr(0644,root,root)102
-%{_libdir}/%{name}.so.%{soname}103
+%{_libdir}/%{name}.so.%{sover}104
105
%files devel106
%defattr(0644,root,root)107
libx264.spec
Changed
106
1
2
3
%define _lto_cflags %{nil}4
# remember to adjust baselibs.conf5
-%define soname 1606
-%bcond_without gpac7
+%define sover 1618
+%bcond_with gpac9
%bcond_with x264_binary10
Name: libx26411
-Version: 0.160+git20200702.cde9a93312
+Version: 0.161+git20200912.d198931a13
Release: 014
Summary: A free h264/avc encoder - encoder binary15
License: GPL-2.0-or-later16
17
Source: x264-%{version}.tar.xz18
Source1: baselibs.conf19
Patch0: x264-use-shared-library.patch20
-# PATCH-FIX-UPSTREAM x264-gpac10.patch21
-Patch1: x264-gpac10.patch22
# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch23
Patch2: x264-gpac_no_static.patch24
BuildRequires: nasm >= 2.1325
26
%if %{with x264_binary}27
%if %{with gpac}28
BuildRequires: pkgconfig(gpac)29
+%else30
+BuildRequires: pkgconfig(liblsmash)31
%endif32
BuildRequires: pkgconfig(ffms2)33
BuildRequires: pkgconfig(libavcodec)34
35
- Custom quantization matrices36
- Parallel encoding of multiple slices (currently disabled)37
38
-%package %{soname}39
+%package %{sover}40
Summary: A free h264/avc encoder - encoder binary41
Group: System/Libraries42
43
-%description %{soname}44
+%description %{sover}45
x264 is a free library for encoding next-generation H264/AVC video46
streams. The code is written from scratch by Laurent Aimar, Loren47
Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans48
49
%package devel50
Summary: Libraries and include file for the %{name} encoder51
Group: Development/Libraries/C and C++52
-Requires: %{name}-%{soname} = %{version}53
+Requires: %{name}-%{sover} = %{version}54
Provides: x264-devel = %{version}55
Obsoletes: x264-devel < %{version}56
57
58
59
%build60
%configure \61
- --disable-lsmash \62
--disable-opencl \63
--enable-shared \64
%if %{with x264_binary}65
%if %{with gpac}66
+ --disable-lsmash \67
%else68
--disable-gpac \69
%endif70
71
--disable-swscale \72
--disable-lavf \73
--disable-ffms \74
- --disable-gpac \75
%endif76
+ --enable-lto \77
--enable-pic78
%make_build79
80
81
82
rm -f %{buildroot}%{_libdir}/%{name}.so83
rm -f %{buildroot}%{_libdir}/%{name}.a84
-ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so85
+ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so86
%endif87
88
%if %{with x264_binary}89
90
%attr(0755,root,root) %{_bindir}/x26491
%else92
93
-%post -n %{name}-%{soname} -p /sbin/ldconfig94
-%postun -n %{name}-%{soname} -p /sbin/ldconfig95
+%post -n %{name}-%{sover} -p /sbin/ldconfig96
+%postun -n %{name}-%{sover} -p /sbin/ldconfig97
98
-%files %{soname}99
+%files %{sover}100
%defattr(0644,root,root)101
-%{_libdir}/%{name}.so.%{soname}102
+%{_libdir}/%{name}.so.%{sover}103
104
%files devel105
%defattr(0644,root,root)106
x264-gpac10.patch
Deleted
50
1
2
-diff --git a/configure b/configure3
-index 51c896e901c5d4bb3ac4408e005380f64fb8f230..78aa11404e414db6168aef920e7e6bdaf5636d7d 1007554
---- a/configure5
-+++ b/configure6
-@@ -1232,15 +1232,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then7
- gpac="no"8
- GPAC_LIBS="-lgpac_static"9
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"10
-+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"11
- if [ "$SYS" = "WINDOWS" ] ; then12
- cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"13
- cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"14
- fi15
- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then16
-- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then17
-+ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then18
- gpac="yes"19
- else20
-- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later"21
-+ echo "Warning: gpac is too old, update to v0.8.0 or later"22
- fi23
- fi24
- fi25
-diff --git a/output/mp4.c b/output/mp4.c26
-index 944e777113c4919520aeae131b542b9b2e0d3366..200cb33a9a19ae41c74f8b057cea3fdd0daf71af 10064427
---- a/output/mp4.c28
-+++ b/output/mp4.c29
-@@ -147,7 +147,11 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest30
- {31
- uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file );32
- uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) );33
-+#if GPAC_VERSION_MAJOR > 834
-+ gf_isom_append_edit( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );35
-+#else36
- gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );37
-+#endif38
- }39
- gf_isom_sample_del( &sample );40
- 41
-@@ -233,7 +237,7 @@ static int set_param( hnd_t handle, x264_param_t *p_param )42
- dw *= sar;43
- else44
- dh /= sar;45
-- 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 );46
-+ 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 );47
- gf_isom_set_track_layout_info( p_mp4->p_file, p_mp4->i_track, dw, dh, 0, 0, 0 );48
- }49
- 50
_service
Changed
10
1
2
<param name="url">https://code.videolan.org/videolan/x264.git</param>3
<param name="scm">git</param>4
<param name="revision">stable</param>5
- <param name="versionformat">0.160+git%cd.%h</param>6
+ <param name="versionformat">0.161+git%cd.%h</param>7
</service>8
<service name="recompress" mode="disabled">9
<param name="file">*.tar</param>10
baselibs.conf
Changed
4
1
2
-libx264-1603
+libx264-1614
update.sh
Added
12
1
2
+#!/bin/sh3
+4
+rm -rf x2645
+git clone -b stable https://code.videolan.org/videolan/x264.git6
+api="$(grep '#define X264_BUILD' < x264/x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"7
+echo "The new api version is:" $api8
+echo "libx264-$api" > baselibs.conf9
+sed -i "/^%define soname/c%define sover $api" libx264.spec10
+sed -i "/versionformat/s/>.*</>0.$api+git%cd.%h</" _service11
+osc service disabledrun12
x264-0.160+git20200702.cde9a933.tar.xz
Deleted
x264-0.161+git20200912.d198931a.tar.xz
Added