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

- Remove patching to configure to disable execinfo.h check and disable

Browse Source 
it from CONFIGURE_ENV instead
- Enable the use of the linker -z,defs option after the -pthread change
- Resync patches

from Brad (maintainer)
This commit is contained in:
ajacoutot 2012-08-28 05:54:05 +00:00
parent 2891dcc78a
commit 63ffe4f28f
6 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multimedia/xine-lib/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.96 2012/06/10 07:35:30 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.97 2012/08/28 05:54:05 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= multimedia decoding library
DISTNAME= xine-lib-1.1.21
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
@ -88,7 +89,8 @@ CONFIGURE_ARGS+=--disable-aalib \
--without-jack \
--without-pulseaudio
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
ac_cv_header_execinfo_h=no
NO_REGRESS= Yes

15
multimedia/xine-lib/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.14 2012/06/27 06:15:47 espie Exp $
--- configure.ac.orig Sat Jun 9 18:40:10 2012
+++ configure.ac Wed Jun 27 08:12:38 2012
$OpenBSD: patch-configure_ac,v 1.15 2012/08/28 05:54:05 ajacoutot Exp $
--- configure.ac.orig Sat Jun 9 12:40:10 2012
+++ configure.ac Sat Jun 30 22:43:15 2012
@@ -558,9 +558,9 @@ t q
b
:q
@ -35,12 +35,3 @@ $OpenBSD: patch-configure_ac,v 1.14 2012/06/27 06:15:47 espie Exp $
AC_SUBST(MNG_LIBS)
else
have_libmng=no
@@ -2255,7 +2256,7 @@ if test "x$some_snprintf" != "xyes" -o \
AC_MSG_ERROR([required function not found])
fi
AC_FUNC_FSEEKO
-AC_CHECK_HEADERS(assert.h byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h alloca.h)
+AC_CHECK_HEADERS(assert.h byteswap.h malloc.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h alloca.h)
AC_REPLACE_FUNCS(asprintf basename gettimeofday setenv strcasestr strndup strpbrk strsep strtok_r timegm unsetenv memmem)
AC_LIBSOURCE(hstrerror.c)

12
multimedia/xine-lib/patches/patch-m4_attributes_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-m4_attributes_m4,v 1.3 2012/08/28 05:54:05 ajacoutot Exp $
--- m4/attributes.m4.orig Mon Aug 27 19:18:38 2012
+++ m4/attributes.m4 Mon Aug 27 19:19:42 2012
@@ -113,7 +113,7 @@ AC_DEFUN([CC_NOUNDEFINED], [
dnl MinGW platforms: for libraries required -no-undefined,
dnl use it only for libraries in mingw32-w64
- *-freebsd* | *-openbsd*) ;;
+ *-freebsd*) ;;
*-mingw* | *-cygwin*)
LDFLAGS_NOUNDEFINED="-no-undefined"
;;

13
multimedia/xine-lib/patches/patch-misc_libxine_pc_in
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-misc_libxine_pc_in,v 1.3 2008/04/15 11:24:14 jakemsr Exp $
--- misc/libxine.pc.in.orig Sun Apr 6 14:32:21 2008
+++ misc/libxine.pc.in Mon Apr 14 20:28:43 2008
@@ -22,7 +22,7 @@ Name: libxine
Description: The xine engine library
Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
Requires:
-Libs: -L${libdir} -lxine
+Libs: -L${libdir} -lxine @PTHREAD_LIBS@
Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir} @PTHREAD_CFLAGS@
Cflags.private: @PTHREAD_CFLAGS@

8
multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.10 2011/11/16 00:43:17 sthen Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Sat Nov 12 20:37:30 2011
+++ src/post/deinterlace/plugins/Makefile.in Sat Nov 12 21:59:05 2011
@@ -899,9 +899,6 @@ maintainer-clean-generic:
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.11 2012/08/28 05:54:05 ajacoutot Exp $
--- src/post/deinterlace/plugins/Makefile.in.orig Sat Jun 9 12:54:43 2012
+++ src/post/deinterlace/plugins/Makefile.in Sat Jun 30 22:43:15 2012
@@ -907,9 +907,6 @@ maintainer-clean-generic:
-@echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in

10
multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.13 2011/11/16 00:43:17 sthen Exp $
--- src/xine-engine/Makefile.in.orig Sat Nov 12 20:37:32 2011
+++ src/xine-engine/Makefile.in Sat Nov 12 21:57:55 2011
@@ -469,7 +469,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.14 2012/08/28 05:54:05 ajacoutot Exp $
--- src/xine-engine/Makefile.in.orig Sat Jun 9 12:54:45 2012
+++ src/xine-engine/Makefile.in Mon Aug 27 19:30:08 2012
@@ -477,7 +477,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
-lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \
- $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS)
+ $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(EXTRA_X_LIBS)
libxine_la_LDFLAGS = \
libxine_la_LDFLAGS = $(LDFLAGS_NOUNDEFINED) \
-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \