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

Remove unneeded libgsm dependency, and prevent it from being picked up

Browse Source 
if present.  This allows us to set PERMIT_PACKAGE_FTP=Yes.

ok espie
This commit is contained in:
deanna 2007-08-09 22:08:19 +00:00
parent 8c2a16ad49
commit 9338113c8f
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/gnash/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2007/07/16 04:02:38 deanna Exp $ # $OpenBSD: Makefile,v 1.14 2007/08/09 22:08:19 deanna Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= "flash player with firefox browser plugin" COMMENT= "flash player with firefox browser plugin"
DISTNAME= gnash-0.8.0 DISTNAME= gnash-0.8.0
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
SHARED_LIBS += gnashbase 2.0 SHARED_LIBS += gnashbase 2.0
SHARED_LIBS += gnashgeo 2.0 SHARED_LIBS += gnashgeo 2.0
SHARED_LIBS += gnashamf 2.0 SHARED_LIBS += gnashamf 2.0
@ -21,7 +21,7 @@ MAINTAINER= Deanna Phillips <deanna@openbsd.org>
# patented codecs # patented codecs
PERMIT_PACKAGE_CDROM= No PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= No PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
@ -41,7 +41,7 @@ LIB_DEPENDS+= curl.>=5::net/curl \
agg.>=2::graphics/agg \ agg.>=2::graphics/agg \
gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
boost_thread-mt,boost_date_time::devel/boost,-libs \ boost_thread-mt,boost_date_time::devel/boost,-libs \
gsm::audio/gsm ltdl::devel/libtool,-ltdl \ ltdl::devel/libtool,-ltdl \
SDL.>=7::devel/sdl \ SDL.>=7::devel/sdl \
vorbis,vorbisenc::audio/libvorbis \ vorbis,vorbisenc::audio/libvorbis \
avcodec.>=9,avutil.>=2,avformat.>=9::graphics/ffmpeg avcodec.>=9,avutil.>=2,avformat.>=9::graphics/ffmpeg

33
www/gnash/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1 2007/07/07 10:47:04 deanna Exp $ $OpenBSD: patch-configure,v 1.2 2007/08/09 22:08:19 deanna Exp $
--- configure.orig Fri Jul 6 09:24:13 2007 --- configure.orig Fri Jun 8 21:41:56 2007
+++ configure Fri Jul 6 09:25:30 2007 +++ configure Thu Aug 9 14:33:08 2007
@@ -5271,7 +5271,7 @@ _ACEOF @@ -5271,7 +5271,7 @@ _ACEOF
@ -10,7 +10,32 @@ $OpenBSD: patch-configure,v 1.1 2007/07/07 10:47:04 deanna Exp $
@@ -50341,10 +50341,10 @@ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t @@ -25566,14 +25566,9 @@ echo "${ECHO_T}${libtheora}" >&6
echo "$as_me:$LINENO: checking for libgsm library" >&5
echo $ECHO_N "checking for libgsm library... $ECHO_C" >&6
- if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs gsm`
- else
libgsm=""
- fi
if test x"${libgsm}" = x; then
if test -f ${topdir}/libgsm.a -o -f ${topdir}/libgsm.${shlibext}; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
echo "$as_me:$LINENO: result: ${topdir}/libgsm" >&5
echo "${ECHO_T}${topdir}/libgsm" >&6
else
@@ -25644,9 +25639,6 @@ LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_destroy" >&5
echo "${ECHO_T}$ac_cv_lib_gsm_gsm_destroy" >&6
-if test $ac_cv_lib_gsm_gsm_destroy = yes; then
- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
-fi
fi
fi
@@ -50341,10 +50333,10 @@ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@EGREP@,$EGREP,;t t s,@EGREP@,$EGREP,;t t
s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t