Packman Build Service PMBS

libx264.patch Deleted

@@ -1,20 +0,0 @@
-[   40s] lto1: warning: switch '-mcpu=cortex-a8' conflicts with '-march=armv7-a' switch
---- a/configure
-+++ b/configure
-@@ -966,7 +966,6 @@ fi
- 
- if [ $asm = auto -a $ARCH = ARM ] ; then
-     # set flags so neon is built by default
--    [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
- 
-     cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
-     if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
-@@ -1031,7 +1030,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
- CPU_ENDIAN="little-endian"
- if [ $compiler = GNU ]; then
-     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
--    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
-+    $CC $CFLAGS -fno-lto conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
-     if (${STRINGS} -a conftest.o | grep -q BIGE) && (${STRINGS} -a conftest.o | grep -q FPendian) ; then
-         define WORDS_BIGENDIAN
-         CPU_ENDIAN="big-endian"

project.diff Deleted

@@ -1,107 +0,0 @@
---- libx264.changes.orig
-+++ libx264.changes
-@@ -1,4 +1,9 @@
- -------------------------------------------------------------------
-+Tue Dec 29 16:16:16 UTC 2020 - olaf@aepfle.de
-+
-+- Fix arm build with libx264.patch
-+
-+-------------------------------------------------------------------
- Sat Nov 28 14:21:00 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
- 
- - Update to git version 0.161+git20200912.d198931a
---- libx264.spec.orig
-+++ libx264.spec
-@@ -17,15 +17,25 @@
- #
- 
- 
--%define _lto_cflags %{nil}
- # remember to adjust baselibs.conf
- %define sover   161
- %bcond_with     gpac
--%bcond_with     x264_binary
--Name:           libx264
-+
-+%define build_flavor @BUILD_FLAVOR@%{nil}
-+%define tag libx264
-+%if "%{build_flavor}" == ""
-+%define pkg %{tag}
-+%else
-+%define pkg %{tag}-%{build_flavor}
-+%endif
-+Name:           %{pkg}
- Version:        0.161+git20200912.d198931a
- Release:        0
--Summary:        A free h264/avc encoder - encoder binary
-+%if "%{build_flavor}" == ""
-+Summary:        A free h264/avc encoder
-+%else
-+Summary:        Command line tool for libx264
-+%endif
- License:        GPL-2.0-or-later
- Group:          Productivity/Multimedia/Video/Editors and Convertors
- URL:            http://www.videolan.org/developers/x264.html
-@@ -34,10 +44,11 @@ Source1:        baselibs.conf
- Patch0:         x264-use-shared-library.patch
- # PATCH_FIX-OPENSUSE x264-gpac_no_static.patch
- Patch2:         x264-gpac_no_static.patch
-+Patch3:         libx264.patch
- BuildRequires:  nasm >= 2.13
- BuildRequires:  pkgconfig
- BuildRequires:  yasm >= 1.2.0
--%if %{with x264_binary}
-+%if "%{build_flavor}" == "x264"
- %if %{with gpac}
- BuildRequires:  pkgconfig(gpac)
- %else
-@@ -106,7 +117,7 @@ mplayer/mencoder with H264 encoding supp
- %package devel
- Summary:        Libraries and include file for the %{name} encoder
- Group:          Development/Libraries/C and C++
--Requires:       %{name}-%{sover} = %{version}
-+Requires:       %{name}-%{sover} = %{version}-%{release}
- Provides:       x264-devel = %{version}
- Obsoletes:      x264-devel < %{version}
- 
-@@ -127,7 +138,7 @@ mplayer/mencoder with H264 encoding supp
- %configure \
-   --disable-opencl \
-   --enable-shared \
--%if %{with x264_binary}
-+%if "%{build_flavor}" == "x264"
- %if %{with gpac}
-   --disable-lsmash \
- %else
-@@ -144,7 +155,7 @@ mplayer/mencoder with H264 encoding supp
- %make_build
- 
- %install
--%if %{with x264_binary}
-+%if "%{build_flavor}" == "x264"
- install -Dm 755 x264 %{buildroot}/%{_bindir}/x264
- %else
- %make_install
-@@ -154,9 +165,8 @@ rm -f %{buildroot}%{_libdir}/%{name}.a
- ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so
- %endif
- 
--%if %{with x264_binary}
-+%if "%{build_flavor}" == "x264"
- %files -n x264
--%defattr(-,root,root)
- %doc doc/*.txt
- %attr(0755,root,root) %{_bindir}/x264
- %else
-@@ -165,11 +175,9 @@ ln -s %{name}.so.%{sover} %{buildroot}%{
- %postun -n %{name}-%{sover} -p /sbin/ldconfig
- 
- %files %{sover}
--%defattr(0644,root,root)
- %{_libdir}/%{name}.so.%{sover}
- 
- %files devel
--%defattr(0644,root,root)
- %{_includedir}/x264.h
- %{_includedir}/x264_config.h
- %{_libdir}/pkgconfig/x264.pc

_link Changed

_multibuild Deleted

Changes of Revision 13