We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 9
project.diff
Deleted
x
1
2
---- _service.orig3
-+++ _service4
-@@ -3,7 +3,7 @@5
- <param name="url">https://code.videolan.org/videolan/x264.git</param>6
- <param name="scm">git</param>7
- <param name="revision">stable</param>8
-- <param name="versionformat">0.159+git%cd.%h</param>9
-+ <param name="versionformat">0.160+git%cd.%h</param>10
- </service>11
- <service name="recompress" mode="disabled">12
- <param name="file">*.tar</param>13
---- baselibs.conf.orig14
-+++ baselibs.conf15
-@@ -1 +1 @@16
--libx264-15917
-+libx264-16018
---- libx264-x264.changes.orig19
-+++ libx264-x264.changes20
-@@ -1,4 +1,12 @@21
- -------------------------------------------------------------------22
-+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>23
-+24
-+- Update to git version 0.160+git20200702.cde9a93325
-+- Bump soversion to 16026
-+- Add x264-gpac10.patch and x264-gpac_no_static.patch27
-+- Spec cleanup28
-+29
-+-------------------------------------------------------------------30
- Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>31
- 32
- - Update to git version 0.159+git20191127.1771b55633
---- libx264-x264.spec.orig34
-+++ libx264-x264.spec35
-@@ -1,6 +1,7 @@36
- #37
- # spec file for package libx26438
- #39
-+# Copyright (c) 2020 Packman Team <packman@links2linux.de>40
- # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.41
- #42
- # All modifications and additions to the file contributed by third parties43
-@@ -12,39 +13,43 @@44
- # license that conforms to the Open Source Definition (Version 1.9)45
- # published by the Open Source Initiative.46
- 47
--# Please submit bugfixes or comments via http://bugs.opensuse.org/48
-+# Please submit bugfixes or comments via https://bugs.links2linux.org/49
- #50
- 51
- 52
- %define _lto_cflags %{nil}53
- # remember to adjust baselibs.conf54
--%define soname 15955
-+%define soname 16056
- %bcond_without gpac57
- ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####58
- %bcond_without x264_binary59
- Name: libx264-x26460
--Version: 0.159+git20191127.1771b55661
-+Version: 0.160+git20200702.cde9a93362
- Release: 063
- Summary: Command line tool for libx26464
--License: GPL-2.0+65
-+License: GPL-2.0-or-later66
- Group: Productivity/Multimedia/Video/Editors and Convertors67
--Url: http://www.videolan.org/developers/x264.html68
-+URL: http://www.videolan.org/developers/x264.html69
- Source: x264-%{version}.tar.xz70
- Source1: baselibs.conf71
- Patch0: x264-use-shared-library.patch72
-+# PATCH-FIX-UPSTREAM x264-gpac10.patch73
-+Patch1: x264-gpac10.patch74
-+# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch75
-+Patch2: x264-gpac_no_static.patch76
- BuildRequires: nasm >= 2.1377
- BuildRequires: pkgconfig78
- BuildRequires: yasm >= 1.2.079
--BuildRoot: %{_tmppath}/%{name}-%{version}-build80
- %if %{with x264_binary}81
- %if %{with gpac}82
--BuildRequires: libgpac-devel83
-+BuildRequires: pkgconfig(gpac)84
- %endif85
- BuildRequires: pkgconfig(ffms2)86
- BuildRequires: pkgconfig(libavcodec)87
- BuildRequires: pkgconfig(libavformat)88
- BuildRequires: pkgconfig(libavutil)89
- BuildRequires: pkgconfig(libswscale)90
-+BuildRequires: pkgconfig(zlib)91
- %endif92
- 93
- %description94
-@@ -120,19 +125,12 @@ mplayer/mencoder with H264 encoding supp95
- %autosetup -p1 -n x264-%{version}96
- 97
- %build98
--FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')99
--sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c100
--101
- %configure \102
- --disable-lsmash \103
- --disable-opencl \104
- --enable-shared \105
- %if %{with x264_binary}106
-- --enable-swscale \107
-- --enable-lavf \108
-- --enable-ffms \109
- %if %{with gpac}110
-- --enable-gpac \111
- %else112
- --disable-gpac \113
- %endif114
-@@ -144,13 +142,13 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/"115
- --disable-gpac \116
- %endif117
- --enable-pic118
--make %{?_smp_mflags}119
-+%make_build120
- 121
- %install122
- %if %{with x264_binary}123
- install -Dm 755 x264 %{buildroot}/%{_bindir}/x264124
- %else125
--make %{?_smp_mflags} DESTDIR=%{buildroot} install126
-+%make_install127
- 128
- rm -f %{buildroot}%{_libdir}/%{name}.so129
- rm -f %{buildroot}%{_libdir}/%{name}.a130
---- libx264.changes.orig131
-+++ libx264.changes132
-@@ -1,4 +1,12 @@133
- -------------------------------------------------------------------134
-+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>135
-+136
-+- Update to git version 0.160+git20200702.cde9a933137
-+- Bump soversion to 160138
-+- Add x264-gpac10.patch and x264-gpac_no_static.patch139
-+- Spec cleanup140
-+141
-+-------------------------------------------------------------------142
- Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>143
- 144
- - Update to git version 0.159+git20191127.1771b556145
---- libx264.spec.orig146
-+++ libx264.spec147
-@@ -1,6 +1,7 @@148
- #149
- # spec file for package libx264150
- #151
-+# Copyright (c) 2020 Packman Team <packman@links2linux.de>152
- # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.153
- #154
- # All modifications and additions to the file contributed by third parties155
-@@ -12,38 +13,42 @@156
- # license that conforms to the Open Source Definition (Version 1.9)157
- # published by the Open Source Initiative.158
- 159
--# Please submit bugfixes or comments via http://bugs.opensuse.org/160
-+# Please submit bugfixes or comments via https://bugs.links2linux.org/161
- #162
- 163
- 164
- %define _lto_cflags %{nil}165
- # remember to adjust baselibs.conf166
--%define soname 159167
-+%define soname 160168
- %bcond_without gpac169
- %bcond_with x264_binary170
- Name: libx264171
--Version: 0.159+git20191127.1771b556172
-+Version: 0.160+git20200702.cde9a933173
- Release: 0174
- Summary: A free h264/avc encoder - encoder binary175
--License: GPL-2.0+176
-+License: GPL-2.0-or-later177
- Group: Productivity/Multimedia/Video/Editors and Convertors178
--Url: http://www.videolan.org/developers/x264.html179
-+URL: http://www.videolan.org/developers/x264.html180
- Source: x264-%{version}.tar.xz181
- Source1: baselibs.conf182
- Patch0: x264-use-shared-library.patch183
-+# PATCH-FIX-UPSTREAM x264-gpac10.patch184
-+Patch1: x264-gpac10.patch185
-+# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch186
-+Patch2: x264-gpac_no_static.patch187
- BuildRequires: nasm >= 2.13188
- BuildRequires: pkgconfig189
- BuildRequires: yasm >= 1.2.0190
--BuildRoot: %{_tmppath}/%{name}-%{version}-build191
- %if %{with x264_binary}192
- %if %{with gpac}193
--BuildRequires: libgpac-devel194
-+BuildRequires: pkgconfig(gpac)195
- %endif196
- BuildRequires: pkgconfig(ffms2)197
- BuildRequires: pkgconfig(libavcodec)198
- BuildRequires: pkgconfig(libavformat)199
- BuildRequires: pkgconfig(libavutil)200
- BuildRequires: pkgconfig(libswscale)201
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
x264-gpac_no_static.patch
Deleted
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
_link
Changed
9
1
2
-<link project="Essentials" cicount="add" baserev="dc7932bc8b13f9935fbd3ac4c7925e62">3
- <patches>4
- <delete name="x264-0.159+git20191127.1771b556.tar.xz" />5
- <apply name="project.diff" />6
- </patches>7
-</link>8
+<link project="Essentials" cicount="add" />9
x264-0.160+git20200702.cde9a933.tar.xz
Deleted