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

Remove --as-needed and -pthread patching.

Browse Source
This commit is contained in:
ajacoutot 2012-09-04 06:38:03 +00:00
parent 73faab8d51
commit 7caf116efd
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/ffmpegthumbnailer/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.18 2012/02/22 08:32:25 dcoppa Exp $ # $OpenBSD: Makefile,v 1.19 2012/09/04 06:38:03 ajacoutot Exp $
COMMENT= lightweight video thumbnailer for file managers COMMENT= lightweight video thumbnailer for file managers
DISTNAME= ffmpegthumbnailer-2.0.7 DISTNAME= ffmpegthumbnailer-2.0.7
CATEGORIES= graphics multimedia CATEGORIES= graphics multimedia
MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/ MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/
REVISION= 0
SHARED_LIBS= ffmpegthumbnailer 4.1 SHARED_LIBS= ffmpegthumbnailer 4.1
@ -16,12 +17,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= avcodec avformat avutil bz2 c gsm jpeg m mp3lame ogg \ WANTLIB += avcodec avformat avutil c jpeg m png pthread stdc++
orc-0.4 png pthread schroedinger-1.0 speex stdc++ \ WANTLIB += swscale
swscale theoradec theoraenc vorbis vorbisenc vpx x264 \
z
LIB_DEPENDS= graphics/ffmpeg>=20100512 \ LIB_DEPENDS= graphics/ffmpeg \
graphics/jpeg \ graphics/jpeg \
graphics/png graphics/png
@ -30,6 +29,6 @@ CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68 AUTOCONF_VERSION= 2.68
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-as-needed CONFIGURE_ARGS= ${CONFIGURE_SHARED}
.include <bsd.port.mk> .include <bsd.port.mk>

27
graphics/ffmpegthumbnailer/patches/patch-configure_ac
View File

@ -1,26 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2011/09/30 09:18:17 dcoppa Exp $ $OpenBSD: patch-configure_ac,v 1.3 2012/09/04 06:38:03 ajacoutot Exp $
--- configure.ac.orig Thu Sep 29 21:04:13 2011 --- configure.ac.orig Sun Jul 24 18:32:46 2011
+++ configure.ac Thu Sep 29 21:06:21 2011 +++ configure.ac Tue Sep 4 08:34:57 2012
@@ -46,6 +46,18 @@ if test "x$enable_as_needed" != "xno"; then @@ -118,7 +118,7 @@ AC_ARG_ENABLE(debug,
esac
fi
+AC_CHECK_HEADER(pthread.h, have_pthread_h=yes)
+if test "X$have_pthread_h" = "Xyes" ; then
+ save_LDFLAGS="${LDFLAGS}";
+ LDFLAGS="${LDFLAGS} -pthread"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>
+ pthread_t thr;]],
+ [pthread_create(&thr, NULL, NULL, NULL);])],,
+ [LDFLAGS="${save_LDFLAGS}"])
+fi
+
#########################################################################
# Check ffmpeg libraries
#########################################################################
@@ -118,7 +130,7 @@ AC_ARG_ENABLE(debug,
AM_CONDITIONAL(DEBUG, test "$enable_debug" = "yes") AM_CONDITIONAL(DEBUG, test "$enable_debug" = "yes")
if test "$DEBUG" = "yes"; then if test "$DEBUG" = "yes"; then
AC_DEFINE(ENABLE_DEBUG, [], "Enable debug mode") AC_DEFINE(ENABLE_DEBUG, [], "Enable debug mode")