[packages/openh264] - updated to 1.7.0 (note: new soname) - updated libdir,no-forced-arch,x32-asm patches - disable xulr
qboosh
qboosh at pld-linux.org
Sun Jul 16 18:38:58 CEST 2017
commit e257106060356c4eef8b86c1e2b3d5df52635964
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 16 18:40:44 2017 +0200
- updated to 1.7.0 (note: new soname)
- updated libdir,no-forced-arch,x32-asm patches
- disable xulrunner by default (no xulrunner/GMP SDK in Th)
no-forced-arch.patch | 16 ++++++++--------
openh264-libdir.patch | 43 ++++++-------------------------------------
openh264.spec | 14 ++++++++------
x32-asm.patch | 10 +++++-----
4 files changed, 27 insertions(+), 56 deletions(-)
---
diff --git a/openh264.spec b/openh264.spec
index 7683bbd..9bc2f26 100644
--- a/openh264.spec
+++ b/openh264.spec
@@ -1,7 +1,7 @@
# TODO: handle GMP plugins better in browser-plugins architecture (only firefox33+ based browsers supported)
#
# Conditional build:
-%bcond_without xulrunner # GMP plugin
+%bcond_with xulrunner # GMP plugin
#
%ifarch x32
%undefine with_xulrunner
@@ -9,12 +9,13 @@
Summary: H.264 codec library
Summary(pl.UTF-8): Biblioteka kodeka H.264
Name: openh264
-Version: 1.4.0
-Release: 2
+Version: 1.7.0
+Release: 1
License: BSD
Group: Libraries
+#Source0Download: https://github.com/cisco/openh264/releases/
Source0: https://github.com/cisco/openh264/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 06d92ee5bd231814394b7e29f0545e57
+# Source0-md5: 93da4e76cfda7ede8fd2df51b0021efd
Patch0: %{name}-libdir.patch
Patch1: no-forced-arch.patch
Patch2: x32-asm.patch
@@ -105,7 +106,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
PREFIX=%{_prefix} \
- LIBDIR=%{_libdir}
+ LIBDIRNAME=%{_lib}
install h264dec h264enc $RPM_BUILD_ROOT%{_bindir}
@@ -135,7 +136,8 @@ fi
%doc CONTRIBUTORS LICENSE README.md RELEASES
%attr(755,root,root) %{_bindir}/h264dec
%attr(755,root,root) %{_bindir}/h264enc
-%attr(755,root,root) %{_libdir}/libopenh264.so.0
+%attr(755,root,root) %{_libdir}/libopenh264.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopenh264.so.4
%files devel
%defattr(644,root,root,755)
diff --git a/no-forced-arch.patch b/no-forced-arch.patch
index b20198b..06540a9 100644
--- a/no-forced-arch.patch
+++ b/no-forced-arch.patch
@@ -1,15 +1,15 @@
---- openh264-1.4.0/build/x86-common.mk~ 2015-03-05 10:25:12.000000000 +0100
-+++ openh264-1.4.0/build/x86-common.mk 2015-04-25 11:09:14.009256846 +0200
+--- openh264-1.7.0/build/x86-common.mk.orig 2017-06-16 06:20:14.000000000 +0200
++++ openh264-1.7.0/build/x86-common.mk 2017-07-16 18:29:20.990148087 +0200
@@ -1,5 +1,3 @@
-CFLAGS_M32=-m32
-CFLAGS_M64=-m64
ASM_INCLUDES = -I$(SRC_PATH)codec/common/x86/
- ifeq (, $(ENABLE64BIT))
- ifeq ($(ARCH), x86_64)
-@@ -7,12 +5,8 @@
+ ifneq ($(ENABLE64BIT),)
+ ifeq ($(ENABLE64BIT), Yes)
+@@ -9,12 +7,8 @@
endif
endif
- ifeq ($(ENABLE64BIT), Yes)
+ ifeq ($(ARCH), x86_64)
-CFLAGS += $(CFLAGS_M64)
-LDFLAGS += $(CFLAGS_M64)
ASMFLAGS_PLATFORM = -DUNIX64
@@ -17,5 +17,5 @@
-CFLAGS += $(CFLAGS_M32)
-LDFLAGS += $(CFLAGS_M32)
ASMFLAGS_PLATFORM = -DX86_32
- endif
- ifeq ($(USE_ASM),Yes)
+ ifeq ($(ENABLEPIC), Yes)
+ CFLAGS += -DX86_32_PICASM
diff --git a/openh264-libdir.patch b/openh264-libdir.patch
index f8e7503..371ceb4 100644
--- a/openh264-libdir.patch
+++ b/openh264-libdir.patch
@@ -1,42 +1,11 @@
---- openh264-1.4.0/Makefile.orig 2015-03-05 10:25:12.000000000 +0100
-+++ openh264-1.4.0/Makefile 2015-03-24 18:23:21.364389942 +0100
-@@ -23,7 +23,7 @@
- SHARED=-shared
+--- openh264-1.7.0/Makefile.orig 2017-07-16 18:14:26.133491636 +0200
++++ openh264-1.7.0/Makefile 2017-07-16 18:16:09.546823791 +0200
+@@ -26,7 +26,7 @@
OBJ=o
DESTDIR=
+ LIBDIR_NAME=lib
-SHAREDLIB_DIR=$(PREFIX)/lib
-+SHAREDLIB_DIR=$(LIBDIR)
++SHAREDLIB_DIR=$(PREFIX)/$(LIBDIR_NAME)
PROJECT_NAME=openh264
MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox38
-@@ -239,12 +239,12 @@
- install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
-
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
-- mkdir -p $(DESTDIR)/$(PREFIX)/lib
-- install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(DESTDIR)/$(PREFIX)/lib
-+ mkdir -p $(DESTDIR)/$(LIBDIR)
-+ install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(DESTDIR)/$(LIBDIR)
-
- install-static: install-static-lib $(PROJECT_NAME)-static.pc
-- mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-- install -m 644 $(PROJECT_NAME)-static.pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig/$(PROJECT_NAME).pc
-+ mkdir -p $(DESTDIR)/$(LIBDIR)/pkgconfig
-+ install -m 644 $(PROJECT_NAME)-static.pc $(DESTDIR)/$(LIBDIR)/pkgconfig/$(PROJECT_NAME)-static.pc
-
- install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $(PROJECT_NAME).pc
- mkdir -p $(DESTDIR)/$(SHAREDLIB_DIR)
-@@ -252,10 +252,10 @@
- if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)/$(SHAREDLIB_DIR); \
- fi
-- mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-- install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-+ mkdir -p $(DESTDIR)/$(LIBDIR)/pkgconfig
-+ install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(LIBDIR)/pkgconfig
- ifneq ($(EXTRA_LIBRARY),)
-- install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(PREFIX)/lib
-+ install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(LIBDIR)
- endif
-
- install: install-static-lib install-shared
+ GMP_API_BRANCH=Firefox39
diff --git a/x32-asm.patch b/x32-asm.patch
index b3debd9..a6f38d9 100644
--- a/x32-asm.patch
+++ b/x32-asm.patch
@@ -1,9 +1,9 @@
---- openh264-1.4.0/build/platform-linux.mk~ 2015-03-05 10:25:12.000000000 +0100
-+++ openh264-1.4.0/build/platform-linux.mk 2015-04-26 11:54:05.533650907 +0200
-@@ -6,7 +6,11 @@
- LDFLAGS += -lpthread
+--- openh264-1.7.0/build/platform-linux.mk.orig 2017-07-16 18:29:39.036814547 +0200
++++ openh264-1.7.0/build/platform-linux.mk 2017-07-16 18:33:08.330145489 +0200
+@@ -9,7 +9,11 @@
+ AR_OPTS = crD $@
ifeq ($(ASM_ARCH), x86)
- ifeq ($(ENABLE64BIT), Yes)
+ ifeq ($(ARCH), x86_64)
+ifeq ($(IS_X32), Yes)
+ASMFLAGS += -f elfx32
+else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openh264.git/commitdiff/e257106060356c4eef8b86c1e2b3d5df52635964
More information about the pld-cvs-commit
mailing list