Changes of Revision 8
libx264-x264.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>4
+5
+- Update to git version 0.160+git20200702.cde9a9336
+- Bump soversion to 1607
+- Add x264-gpac10.patch and x264-gpac_no_static.patch8
+- Spec cleanup9
+10
+-------------------------------------------------------------------11
Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>12
13
- Update to git version 0.159+git20191127.1771b55614
libx264.changes
Changed
14
1
2
-------------------------------------------------------------------3
+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>4
+5
+- Update to git version 0.160+git20200702.cde9a9336
+- Bump soversion to 1607
+- Add x264-gpac10.patch and x264-gpac_no_static.patch8
+- Spec cleanup9
+10
+-------------------------------------------------------------------11
Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>12
13
- Update to git version 0.159+git20191127.1771b55614
libx264-x264.spec
Changed
96
1
2
#3
# spec file for package libx2644
#5
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>6
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.7
#8
# All modifications and additions to the file contributed by third parties9
10
# license that conforms to the Open Source Definition (Version 1.9)11
# published by the Open Source Initiative.12
13
-# Please submit bugfixes or comments via http://bugs.opensuse.org/14
+# Please submit bugfixes or comments via https://bugs.links2linux.org/15
#16
17
18
%define _lto_cflags %{nil}19
# remember to adjust baselibs.conf20
-%define soname 15921
+%define soname 16022
%bcond_without gpac23
##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####24
%bcond_without x264_binary25
Name: libx264-x26426
-Version: 0.159+git20191127.1771b55627
+Version: 0.160+git20200702.cde9a93328
Release: 029
Summary: Command line tool for libx26430
-License: GPL-2.0+31
+License: GPL-2.0-or-later32
Group: Productivity/Multimedia/Video/Editors and Convertors33
-Url: http://www.videolan.org/developers/x264.html34
+URL: http://www.videolan.org/developers/x264.html35
Source: x264-%{version}.tar.xz36
Source1: baselibs.conf37
Patch0: x264-use-shared-library.patch38
+# PATCH-FIX-UPSTREAM x264-gpac10.patch39
+Patch1: x264-gpac10.patch40
+# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch41
+Patch2: x264-gpac_no_static.patch42
BuildRequires: nasm >= 2.1343
BuildRequires: pkgconfig44
BuildRequires: yasm >= 1.2.045
-BuildRoot: %{_tmppath}/%{name}-%{version}-build46
%if %{with x264_binary}47
%if %{with gpac}48
-BuildRequires: libgpac-devel49
+BuildRequires: pkgconfig(gpac)50
%endif51
BuildRequires: pkgconfig(ffms2)52
BuildRequires: pkgconfig(libavcodec)53
BuildRequires: pkgconfig(libavformat)54
BuildRequires: pkgconfig(libavutil)55
BuildRequires: pkgconfig(libswscale)56
+BuildRequires: pkgconfig(zlib)57
%endif58
59
%description60
61
%autosetup -p1 -n x264-%{version}62
63
%build64
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')65
-sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c66
-67
%configure \68
--disable-lsmash \69
--disable-opencl \70
--enable-shared \71
%if %{with x264_binary}72
- --enable-swscale \73
- --enable-lavf \74
- --enable-ffms \75
%if %{with gpac}76
- --enable-gpac \77
%else78
--disable-gpac \79
%endif80
81
--disable-gpac \82
%endif83
--enable-pic84
-make %{?_smp_mflags}85
+%make_build86
87
%install88
%if %{with x264_binary}89
install -Dm 755 x264 %{buildroot}/%{_bindir}/x26490
%else91
-make %{?_smp_mflags} DESTDIR=%{buildroot} install92
+%make_install93
94
rm -f %{buildroot}%{_libdir}/%{name}.so95
rm -f %{buildroot}%{_libdir}/%{name}.a96
libx264.spec
Changed
95
1
2
#3
# spec file for package libx2644
#5
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>6
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.7
#8
# All modifications and additions to the file contributed by third parties9
10
# license that conforms to the Open Source Definition (Version 1.9)11
# published by the Open Source Initiative.12
13
-# Please submit bugfixes or comments via http://bugs.opensuse.org/14
+# Please submit bugfixes or comments via https://bugs.links2linux.org/15
#16
17
18
%define _lto_cflags %{nil}19
# remember to adjust baselibs.conf20
-%define soname 15921
+%define soname 16022
%bcond_without gpac23
%bcond_with x264_binary24
Name: libx26425
-Version: 0.159+git20191127.1771b55626
+Version: 0.160+git20200702.cde9a93327
Release: 028
Summary: A free h264/avc encoder - encoder binary29
-License: GPL-2.0+30
+License: GPL-2.0-or-later31
Group: Productivity/Multimedia/Video/Editors and Convertors32
-Url: http://www.videolan.org/developers/x264.html33
+URL: http://www.videolan.org/developers/x264.html34
Source: x264-%{version}.tar.xz35
Source1: baselibs.conf36
Patch0: x264-use-shared-library.patch37
+# PATCH-FIX-UPSTREAM x264-gpac10.patch38
+Patch1: x264-gpac10.patch39
+# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch40
+Patch2: x264-gpac_no_static.patch41
BuildRequires: nasm >= 2.1342
BuildRequires: pkgconfig43
BuildRequires: yasm >= 1.2.044
-BuildRoot: %{_tmppath}/%{name}-%{version}-build45
%if %{with x264_binary}46
%if %{with gpac}47
-BuildRequires: libgpac-devel48
+BuildRequires: pkgconfig(gpac)49
%endif50
BuildRequires: pkgconfig(ffms2)51
BuildRequires: pkgconfig(libavcodec)52
BuildRequires: pkgconfig(libavformat)53
BuildRequires: pkgconfig(libavutil)54
BuildRequires: pkgconfig(libswscale)55
+BuildRequires: pkgconfig(zlib)56
%endif57
58
%description59
60
%autosetup -p1 -n x264-%{version}61
62
%build63
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')64
-sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c65
-66
%configure \67
--disable-lsmash \68
--disable-opencl \69
--enable-shared \70
%if %{with x264_binary}71
- --enable-swscale \72
- --enable-lavf \73
- --enable-ffms \74
%if %{with gpac}75
- --enable-gpac \76
%else77
--disable-gpac \78
%endif79
80
--disable-gpac \81
%endif82
--enable-pic83
-make %{?_smp_mflags}84
+%make_build85
86
%install87
%if %{with x264_binary}88
install -Dm 755 x264 %{buildroot}/%{_bindir}/x26489
%else90
-make %{?_smp_mflags} DESTDIR=%{buildroot} install91
+%make_install92
93
rm -f %{buildroot}%{_libdir}/%{name}.so94
rm -f %{buildroot}%{_libdir}/%{name}.a95
x264-gpac10.patch
Added
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
x264-gpac_no_static.patch
Added
15
1
2
+Index: x264-0.160+git20200702.4c2aafd8/configure3
+===================================================================4
+--- x264-0.160+git20200702.4c2aafd8.orig/configure5
++++ x264-0.160+git20200702.4c2aafd8/configure6
+@@ -1230,7 +1230,7 @@ fi7
+ 8
+ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then9
+ gpac="no"10
+- GPAC_LIBS="-lgpac_static"11
++ GPAC_LIBS="-lgpac"12
+ cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"13
+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"14
+ if [ "$SYS" = "WINDOWS" ] ; then15
_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.159+git%cd.%h</param>6
+ <param name="versionformat">0.160+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-1593
+libx264-1604
x264-0.159+git20191127.1771b556.tar.xz
Deleted
x264-0.160+git20200702.cde9a933.tar.xz
Added