$ git show --format=fuller --patch-with-stat --summary f3d0f5ac0471534bec57eca99bde23eaaab817e8

commit f3d0f5ac0471534bec57eca99bde23eaaab817e8
Author:     Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Fri Oct 23 18:01:31 2020 +0200
Commit:     Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Fri Oct 23 18:01:42 2020 +0200

    2.1.1, clean up spec, remove -L/usr/lib from *.pc, fix libpackage naming
---
 .abf.yml                        |  4 ++--
 openh264-2.1.1-no-Lusrlib.patch | 15 +++++++++++++++
 openh264.spec                   | 32 +++++++++++++-------------------
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 openh264-2.1.1-no-Lusrlib.patch

diff --git a/.abf.yml b/.abf.yml
index 7778e52..98dfbd8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
-  master.zip: 26294fead747c92ba735f29a86de975768de1eb3
-  v2.0.0.tar.gz: de4f1f0d14f5495f6b04303d7941c3b83d8ee01b
+  v2.1.1.tar.gz: d7870fc418ad7eaa718b4d05c03b10a146b5824b
+  master.tar.gz: 89337a70e6c291f366b07bc738beb8ea097fc5cc
diff --git a/openh264-2.1.1-no-Lusrlib.patch b/openh264-2.1.1-no-Lusrlib.patch
new file mode 100644
index 0000000..a2ea6f1
--- /dev/null
+++ b/openh264-2.1.1-no-Lusrlib.patch
@@ -0,0 +1,15 @@
+diff -up openh264-2.1.1/openh264.pc.in.omv~ openh264-2.1.1/openh264.pc.in
+--- openh264-2.1.1/openh264.pc.in.omv~	2020-10-23 17:48:45.140138000 +0200
++++ openh264-2.1.1/openh264.pc.in	2020-10-23 17:49:23.862294669 +0200
+@@ -1,10 +1,7 @@
+ prefix=@prefix@
+-libdir=@libdir@
+-includedir=${prefix}/include
+ 
+ Name: OpenH264
+ Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
+ Version: @VERSION@
+-Libs: -L${libdir} -lopenh264 @LIBS@
++Libs: -lopenh264 @LIBS@
+ Libs.private: @LIBS_PRIVATE@
+-Cflags: -I${includedir}
diff --git a/openh264.spec b/openh264.spec
index 3e0f532..01550c2 100644
--- a/openh264.spec
+++ b/openh264.spec
@@ -1,4 +1,4 @@
-%define major 4
+%define major 6
 %define libname	%mklibname openh264 %{major}
 %define devname	%mklibname -d openh264
 
@@ -7,11 +7,12 @@ Summary:      	Open Source H.264 Codec
 URL:          	http://www.openh264.org/
 Group:        	System/Libraries
 License:      	BSD
-Version:	2.0.0
+Version:	2.1.1
 Release:        1
 Source0:	https://github.com/cisco/openh264/archive/v%{version}.tar.gz
 Source1:	openh264.rpmlintrc
-Source2:	https://github.com/mozilla/gmp-api/archive/master.zip
+Source2:	https://github.com/mozilla/gmp-api/archive/master.tar.gz
+Patch0:		openh264-2.1.1-no-Lusrlib.patch
 BuildRequires: 	nasm git unzip
 
 %description
@@ -42,17 +43,10 @@ The mozilla-openh264 package contains a H.264 codec plugin for Mozilla
 browsers.
 
 %prep
-%setup -q
-
-#------------------------|
-# Api for mozilla plugin
-# Extract gmp-api archive
-unzip %{S:2}
-mv gmp-api-master gmp-api
-#------------------------|
+%autosetup -p1 -a 2
+ln -s gmp-api-master gmp-api
 
 %build
-
 # Update the makefile with our build options
 sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile
 sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile
@@ -60,16 +54,13 @@ sed -i -e 's|^LIBDIR_NAME=.*$|LIBDIR_NAME=%{_lib}|' Makefile
 sed -i -e 's|^SHAREDLIB_DIR=.*$|SHAREDLIB_DIR=%{_libdir}|' Makefile
 sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{ldflags}' Makefile
 
-%make CC=%{__cc} CXX=%{__cxx}
+%make_build CC=%{__cc} CXX=%{__cxx}
 
 # build mozilla plugin
-%make plugin CC=%{__cc} CXX=%{__cxx}
+%make_build plugin CC=%{__cc} CXX=%{__cxx}
 
 %install
-%makeinstall_std
-%ifarch x86_64 aarch64
-sed -i 's|${prefix}/lib|${prefix}/lib64|g' %{buildroot}/%{_libdir}/pkgconfig/openh264.pc
-%endif
+%make_install
 
 #--------------------------------------------|
 #Install mozilla plugin
@@ -107,7 +98,10 @@ rm %{buildroot}%{_libdir}/*.a
 %{_bindir}/h264dec
 
 %files -n %{libname}
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/lib%{name}.so.%{major}*
+# This is wrong, but since upstream creates that link,
+# chances are some build systems rely on it...
+%{_libdir}/lib%{name}.so.%{version}
 
 %files -n %{devname}
 %doc README.md LICENSE CONTRIBUTORS