From 310c7c36b8a3ec438ec482de98fb732e5338ca2e Mon Sep 17 00:00:00 2001
From: Chenxi Mao <chenxi.mao@suse.com>
Date: Tue, 21 Dec 2021 10:08:32 +0800
Subject: [PATCH] x264: fix build error because of incorrect macro definition.

Fix x264 package as we did in 21.09, the original macro definition
is incorrect and lead to build fail.

The root cause is we cannot provide gpac* devel package in our
build env, so we need to set correct macro to disable it.

On the other hand, X264 is set to disable/exclude status on
OpenEuler 2109 official OBS build server.

Change-Id: I6a3fb1b705a8b6f9b5400cb74c51be9d4276735a
Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
(cherry picked from commit d2fba62c52f9fd17ec5400fb573d5124483dde5f)
---
 x264.spec | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/x264.spec b/x264.spec
index c8d7bb1..34dfa8a 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,13 +7,17 @@
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
 
-%global _with_bootstrap 1
+# The marco defination logic as below:
+# _with_bootstrap to 1
+# ==> set _without_* to 1
+#   ==> Don't require gpac/zlib/*-devel
+%define _with_bootstrap 1
 
-%{?_with_bootstrap:
-%global _without_gpac 1
-%global _without_libavformat 1
-%global _without_libswscale  1
-}
+%if %{_with_bootstrap}
+%define _without_gpac 1
+%define _without_libavformat 1
+%define _without_libswscale  1
+%endif
 #Whitelist of arches with dedicated ASM code
 %global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64
 # list of arches where ASM must be optional
@@ -31,7 +35,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}
+Release: 13%{?gver}%{?_with_bootstrap:_bootstrap}
 License: GPLv2+
 URL: https://www.videolan.org/developers/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -207,5 +211,8 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %endif
 
 %changelog
+* Tue Dec 21 2021 - Chenxi Mao <chenxi.mao@suse.com> - 0.157-13
+- x264: fix build error
+
 * Fri May 07 2021 weidong <weidong@uniontech.com> - 0.157-12.20190717git34c06d1
 - Initial package.