Request 5580 (accepted)

Overview

Request 5580 (accepted)

No description set

Created by Aloysius over 2 years ago
In state accepted

Submit libx264

Submit package Staging / libx264 to package Essentials / libx264

libx264.changes Changed

libx264.spec Changed

@@ -18,7 +18,7 @@
 
 
 # remember to adjust baselibs.conf
-%define sover   161
+%define sover   164
 %bcond_with     gpac
 
 %define build_flavor @BUILD_FLAVOR@%{nil}
@@ -29,7 +29,7 @@
 %define pkg %{tag}-%{build_flavor}
 %endif
 Name:           %{pkg}
-Version:        0.161+git20200912.d198931a
+Version:        0.164+git20220602.baee400f
 Release:        0
 %if "%{build_flavor}" == ""
 Summary:        A free h264/avc encoder
@@ -41,14 +41,11 @@
 URL:            http://www.videolan.org/developers/x264.html
 Source:         x264-%{version}.tar.xz
 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 "%{build_flavor}" == "x264"
+BuildRequires:  pkgconfig(x264) == %{version}
 %if %{with gpac}
 BuildRequires:  pkgconfig(gpac)
 %else
@@ -139,6 +136,7 @@
   --disable-opencl \
   --enable-shared \
 %if "%{build_flavor}" == "x264"
+  --system-libx264 \
 %if %{with gpac}
   --disable-lsmash \
 %else
@@ -163,6 +161,9 @@
 rm -f %{buildroot}%{_libdir}/%{name}.so
 rm -f %{buildroot}%{_libdir}/%{name}.a
 ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so
+
+# fix pkg-config version
+sed -i 's/Version:.*/Version: %{version}/' %{buildroot}%{_libdir}/pkgconfig/x264.pc
 %endif
 
 %if "%{build_flavor}" == "x264"

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 i2 = {0x42494745,0}; double f2 = {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"