cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a linking fix for libtheoraenc to libtheoradec from upstream

Browse Source 
and fix the theora pkg-config files for overlinking with shared
libs.

ok sthen@
This commit is contained in:
brad 2013-04-14 00:41:46 +00:00
parent e882e4acb8
commit a25931fb47
5 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/libtheora/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2013/03/21 08:46:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2013/04/14 00:41:46 brad Exp $
COMMENT= open video codec
DISTNAME= libtheora-1.1.1
REVISION= 1
REVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xiph.org/releases/theora/
EXTRACT_SUFX= .tar.bz2

12
multimedia/libtheora/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2013/04/14 00:41:46 brad Exp $
--- lib/Makefile.in.orig Sat Mar 30 00:32:33 2013
+++ lib/Makefile.in Sat Mar 30 00:36:04 2013
@@ -357,7 +357,7 @@ libtheora_la_OBJECTS = $(am_libtheora_la_OBJECTS)
libtheoradec_la_LIBADD =
am_libtheoradec_la_OBJECTS = $(am__objects_3)
libtheoradec_la_OBJECTS = $(am_libtheoradec_la_OBJECTS)
-libtheoraenc_la_LIBADD =
+libtheoraenc_la_LIBADD = libtheoradec.la
@THEORA_DISABLE_ENCODE_FALSE@am__objects_8 = mmxfrag.lo mmxidct.lo \
@THEORA_DISABLE_ENCODE_FALSE@ mmxstate.lo x86state.lo
@THEORA_DISABLE_ENCODE_FALSE@am__objects_9 =

15
multimedia/libtheora/patches/patch-theora_pc_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-theora_pc_in,v 1.1 2013/04/14 00:41:46 brad Exp $
Correct pkg-config file for overlinking.
--- theora.pc.in.orig Sat Mar 30 00:46:26 2013
+++ theora.pc.in Sat Mar 30 00:46:44 2013
@@ -8,7 +8,7 @@ includedir=@includedir@
Name: theora
Description: Theora video codec
Version: @VERSION@
-Requires: ogg >= 1.1
+Requires.private: ogg >= 1.1
Conflicts:
Libs: -L${libdir} -ltheora
Cflags: -I${includedir}

14
multimedia/libtheora/patches/patch-theoradec_pc_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-theoradec_pc_in,v 1.1 2013/04/14 00:41:46 brad Exp $
Correct pkg-config file for overlinking.
--- theoradec.pc.in.orig Sat Mar 30 00:46:54 2013
+++ theoradec.pc.in Sat Mar 30 00:47:13 2013
@@ -8,7 +8,6 @@ includedir=@includedir@
Name: theora
Description: Theora video codec (decoder)
Version: @VERSION@
-Requires: ogg >= 1.1
Conflicts:
Libs: -L${libdir} -ltheoradec
Cflags: -I${includedir}

15
multimedia/libtheora/patches/patch-theoraenc_pc_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-theoraenc_pc_in,v 1.1 2013/04/14 00:41:46 brad Exp $
Correct pkg-config file for overlinking.
--- theoraenc.pc.in.orig Sat Mar 30 00:47:20 2013
+++ theoraenc.pc.in Sat Mar 30 00:47:51 2013
@@ -8,7 +8,7 @@ includedir=@includedir@
Name: theora
Description: Theora video codec (encoder)
Version: @VERSION@
-Requires: theoradec, ogg >= 1.1
+Requires.private: theoradec, ogg >= 1.1
Conflicts:
Libs: -L${libdir} -ltheoraenc
Cflags: -I${includedir}