Packman Build Service PMBS

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

@@ -1,239 +0,0 @@
---- _service.orig
-+++ _service
-@@ -3,7 +3,7 @@
-     <param name="url">https://code.videolan.org/videolan/x264.git</param>
-     <param name="scm">git</param>
-     <param name="revision">stable</param>
--    <param name="versionformat">0.159+git%cd.%h</param>
-+    <param name="versionformat">0.160+git%cd.%h</param>
-   </service>
-   <service name="recompress" mode="disabled">
-     <param name="file">*.tar</param>
---- baselibs.conf.orig
-+++ baselibs.conf
-@@ -1 +1 @@
--libx264-159
-+libx264-160
---- libx264-x264.changes.orig
-+++ libx264-x264.changes
-@@ -1,4 +1,12 @@
- -------------------------------------------------------------------
-+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
-+
-+- Update to git version 0.160+git20200702.cde9a933
-+- Bump soversion to 160
-+- Add x264-gpac10.patch and x264-gpac_no_static.patch
-+- Spec cleanup
-+
-+-------------------------------------------------------------------
- Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>
- 
- - Update to git version 0.159+git20191127.1771b556
---- libx264-x264.spec.orig
-+++ libx264-x264.spec
-@@ -1,6 +1,7 @@
- #
- # spec file for package libx264
- #
-+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
- # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
- #
- # All modifications and additions to the file contributed by third parties
-@@ -12,39 +13,43 @@
- # license that conforms to the Open Source Definition (Version 1.9)
- # published by the Open Source Initiative.
- 
--# Please submit bugfixes or comments via http://bugs.opensuse.org/
-+# Please submit bugfixes or comments via https://bugs.links2linux.org/
- #
- 
- 
- %define _lto_cflags %{nil}
- # remember to adjust baselibs.conf
--%define soname  159
-+%define soname  160
- %bcond_without  gpac
- ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
- %bcond_without  x264_binary
- Name:           libx264-x264
--Version:        0.159+git20191127.1771b556
-+Version:        0.160+git20200702.cde9a933
- Release:        0
- Summary:        Command line tool for libx264
--License:        GPL-2.0+
-+License:        GPL-2.0-or-later
- Group:          Productivity/Multimedia/Video/Editors and Convertors
--Url:            http://www.videolan.org/developers/x264.html
-+URL:            http://www.videolan.org/developers/x264.html
- 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
- BuildRequires:  pkgconfig
- BuildRequires:  yasm >= 1.2.0
--BuildRoot:      %{_tmppath}/%{name}-%{version}-build
- %if %{with x264_binary}
- %if %{with gpac}
--BuildRequires:  libgpac-devel
-+BuildRequires:  pkgconfig(gpac)
- %endif
- BuildRequires:  pkgconfig(ffms2)
- BuildRequires:  pkgconfig(libavcodec)
- BuildRequires:  pkgconfig(libavformat)
- BuildRequires:  pkgconfig(libavutil)
- BuildRequires:  pkgconfig(libswscale)
-+BuildRequires:  pkgconfig(zlib)
- %endif
- 
- %description
-@@ -120,19 +125,12 @@ mplayer/mencoder with H264 encoding supp
- %autosetup -p1 -n x264-%{version}
- 
- %build
--FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
--sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c
--
- %configure \
-   --disable-lsmash \
-   --disable-opencl \
-   --enable-shared \
- %if %{with x264_binary}
--  --enable-swscale \
--  --enable-lavf \
--  --enable-ffms \
- %if %{with gpac}
--  --enable-gpac \
- %else
-   --disable-gpac \
- %endif
-@@ -144,13 +142,13 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/"
-   --disable-gpac \
- %endif
-   --enable-pic
--make %{?_smp_mflags}
-+%make_build
- 
- %install
- %if %{with x264_binary}
- install -Dm 755 x264 %{buildroot}/%{_bindir}/x264
- %else
--make %{?_smp_mflags} DESTDIR=%{buildroot} install
-+%make_install
- 
- rm -f %{buildroot}%{_libdir}/%{name}.so
- rm -f %{buildroot}%{_libdir}/%{name}.a
---- libx264.changes.orig
-+++ libx264.changes
-@@ -1,4 +1,12 @@
- -------------------------------------------------------------------
-+Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
-+
-+- Update to git version 0.160+git20200702.cde9a933
-+- Bump soversion to 160
-+- Add x264-gpac10.patch and x264-gpac_no_static.patch
-+- Spec cleanup
-+
-+-------------------------------------------------------------------
- Mon Mar 30 14:27:04 UTC 2020 - Antonio Larrosa <antonio.larrosa@gmail.com>
- 
- - Update to git version 0.159+git20191127.1771b556
---- libx264.spec.orig
-+++ libx264.spec
-@@ -1,6 +1,7 @@
- #
- # spec file for package libx264
- #
-+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
- # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
- #
- # All modifications and additions to the file contributed by third parties
-@@ -12,38 +13,42 @@
- # license that conforms to the Open Source Definition (Version 1.9)
- # published by the Open Source Initiative.
- 
--# Please submit bugfixes or comments via http://bugs.opensuse.org/
-+# Please submit bugfixes or comments via https://bugs.links2linux.org/
- #
- 
- 
- %define _lto_cflags %{nil}
- # remember to adjust baselibs.conf
--%define soname  159
-+%define soname  160
- %bcond_without  gpac
- %bcond_with     x264_binary
- Name:           libx264
--Version:        0.159+git20191127.1771b556
-+Version:        0.160+git20200702.cde9a933
- Release:        0
- Summary:        A free h264/avc encoder - encoder binary
--License:        GPL-2.0+
-+License:        GPL-2.0-or-later
- Group:          Productivity/Multimedia/Video/Editors and Convertors
--Url:            http://www.videolan.org/developers/x264.html
-+URL:            http://www.videolan.org/developers/x264.html
- 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
- BuildRequires:  pkgconfig
- BuildRequires:  yasm >= 1.2.0
--BuildRoot:      %{_tmppath}/%{name}-%{version}-build
- %if %{with x264_binary}
- %if %{with gpac}
--BuildRequires:  libgpac-devel
-+BuildRequires:  pkgconfig(gpac)
- %endif
- BuildRequires:  pkgconfig(ffms2)
- BuildRequires:  pkgconfig(libavcodec)
- BuildRequires:  pkgconfig(libavformat)
- BuildRequires:  pkgconfig(libavutil)
- BuildRequires:  pkgconfig(libswscale)

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 );
-     }
-

x264-gpac_no_static.patch Deleted

_link Changed

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