From 41cc6e0d88d2aa9be38cda84b28983a8665938de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 4 Feb 2020 14:24:10 +0100
Subject: [PATCH] x264: bump, libversioncompat, debuginfo, remove old

---
 media-libs/x264/x264-20160712.recipe          | 64 -------------------
 ...4-20170512.recipe => x264-20191217.recipe} | 14 ++--
 2 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 media-libs/x264/x264-20160712.recipe
 rename media-libs/x264/{x264-20170512.recipe => x264-20191217.recipe} (79%)

diff --git a/media-libs/x264/x264-20160712.recipe b/media-libs/x264/x264-20160712.recipe
deleted file mode 100644
index 8acf0e4b9..000000000
--- a/media-libs/x264/x264-20160712.recipe
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY="An encoder for x264 h.264/AVC"
-DESCRIPTION="x264 is a h.264/AVC encoder library."
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-COPYRIGHT="2003-2016 VideoLan.org"
-LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$portVersion-2245.tar.bz2"
-CHECKSUM_SHA256="d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e"
-SOURCE_DIR="x264-snapshot-$portVersion-2245"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	x264$secondaryArchSuffix = $portVersion compat >= 20140308
-	cmd:x264$secondaryArchSuffix
-	lib:libx264$secondaryArchSuffix = 148 compat >= 148
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308
-	devel:libx264$secondaryArchSuffix = 148 compat >= 148
-	"
-REQUIRES_devel="
-	x264$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:yasm >= 1.2.0
-	"
-
-BUILD()
-{
-	CFLAGS="-fPIC" runConfigure --omit-dirs \
-		"manDir oldIncludeDir sbinDir localStateDir sharedStateDir sysconfDir infoDir dataDir dataRootDir libExecDir docDir" \
-		--omit-buildspec ./configure --enable-pic --enable-shared \
-		--extra-ldflags='-Wl,-Bsymbolic'
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libx264
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
diff --git a/media-libs/x264/x264-20170512.recipe b/media-libs/x264/x264-20191217.recipe
similarity index 79%
rename from media-libs/x264/x264-20170512.recipe
rename to media-libs/x264/x264-20191217.recipe
index 6e50481e1..8a320a0db 100644
--- a/media-libs/x264/x264-20170512.recipe
+++ b/media-libs/x264/x264-20191217.recipe
@@ -5,16 +5,19 @@ COPYRIGHT="2003-2017 VideoLan.org"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$portVersion-2245.tar.bz2"
-CHECKSUM_SHA256="f5cd230cde94e13f0f09975b0eb02419ccf5325185d30b483c672866c24a7644"
+CHECKSUM_SHA256="0bb67d095513391e637b3b47e8efc3ba4603c3844f1b4c2690f4d36da7763055"
 SOURCE_DIR="x264-snapshot-$portVersion-2245"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="157"
+libVersionCompat="$libVersion compat >= ${libVersion}"
+
 PROVIDES="
 	x264$secondaryArchSuffix = $portVersion compat >= 20140308
 	cmd:x264$secondaryArchSuffix
-	lib:libx264$secondaryArchSuffix = 148 compat >= 148
+	lib:libx264$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -22,7 +25,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308
-	devel:libx264$secondaryArchSuffix = 148 compat >= 148
+	devel:libx264$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	x264$secondaryArchSuffix == $portVersion base
@@ -39,9 +42,12 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:yasm >= 1.2.0
+	cmd:nasm >= 2.13
 	"
 
+defineDebugInfoPackage x264$secondaryArchSuffix \
+	"$libDir"/libx264.so.$libVersion
+
 BUILD()
 {
 	CFLAGS="-fPIC" runConfigure --omit-dirs \