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

simple configure/build/wantlib fixes for FLAC 1.2.0

Browse Source
This commit is contained in:
naddy 2007-09-18 18:26:52 +00:00
parent ab84730d54
commit eb946052cf
6 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/mpd/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2007/07/19 08:06:24 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2007/09/18 18:26:52 naddy Exp $
COMMENT= Music Player Daemon
DISTNAME= mpd-0.13.0
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= audio
HOMEPAGE= http://www.musicpd.org/
MAINTAINER= Tobias Ulmer <tobiasu@tmux.org>
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread z
WANTLIB= c m pthread ogg z
MASTER_SITES= ${HOMEPAGE}uploads/files/
@ -23,6 +23,7 @@ LIB_DEPENDS= audiofile::devel/libaudiofile \
ao::audio/libao \
samplerate::audio/libsamplerate \
faad.>=1::audio/faad \
FLAC::audio/flac \
id3tag::audio/libid3tag \
mad::audio/libmad \
mikmod::audio/libmikmod \
@ -47,14 +48,11 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CONFIGURE_ARGS+= --with-tremor \
--disable-oggflac \
--disable-shout
LIB_DEPENDS+= vorbisidec::audio/tremor \
FLAC::audio/flac
LIB_DEPENDS+= vorbisidec::audio/tremor
.else
WANTLIB+= theora
LIB_DEPENDS+= vorbis,vorbisfile,vorbisenc::audio/libvorbis \
ogg::audio/libogg \
OggFLAC,FLAC::audio/flac \
speex::audio/speex \
shout::net/libshout
.endif

14
audio/mpd/patches/patch-configure
View File

@ -1,11 +1,11 @@
--- configure.orig Mon May 28 15:20:18 2007
+++ configure Fri Jun 22 13:31:06 2007
@@ -28646,7 +28646,7 @@ fi
LIBOGGFLAC_LIBS="-L$libdir"
+++ configure Mon Sep 3 21:10:03 2007
@@ -28231,7 +28231,7 @@ fi
LIBFLAC_LIBS="-L$libdir"
fi
- LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
+ LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -logg -lm"
- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
if test "x$libOggFLAC_includes" != "x" ; then
LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes"
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"

6
audio/p5-Audio-FLAC-Header/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2007/09/16 15:19:44 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2007/09/18 18:26:52 naddy Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= interface to FLAC header metadata
MODULES= cpan
DISTNAME= Audio-FLAC-Header-1.8
PKGNAME= p5-${DISTNAME}p0
CATEGORIES= audio
MAINTAINER= Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
@ -18,7 +19,8 @@ PERMIT_DISTFILES_FTP= Yes
CONFIGURE_ENV= INCPATH="${LOCALBASE}/include" LIBPATH="${LOCALBASE}/lib"
LIB_DEPENDS= FLAC.>=7::audio/flac
WANTLIB= ogg
LIB_DEPENDS= FLAC.>=8::audio/flac
MAKE_ENV= TEST_POD=Yes

12
audio/p5-Audio-FLAC-Header/patches/patch-Makefile_PL
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-Makefile_PL,v 1.3 2007/07/05 12:40:24 steven Exp $
--- Makefile.PL.orig Thu Jul 5 14:26:57 2007
+++ Makefile.PL Thu Jul 5 14:27:03 2007
@@ -10,6 +10,8 @@ all_from('Header.pm');
$OpenBSD: patch-Makefile_PL,v 1.4 2007/09/18 18:26:52 naddy Exp $
--- Makefile.PL.orig Sat Jan 6 00:48:45 2007
+++ Makefile.PL Tue Sep 18 17:13:30 2007
@@ -10,7 +10,9 @@ all_from('Header.pm');
if ($^O =~ /win32/i) {
cc_lib_links('FLAC_static');
} else {
- cc_lib_links('FLAC');
+ cc_inc_paths($ENV{'INCPATH'});
+ cc_lib_paths($ENV{'LIBPATH'});
cc_lib_links('FLAC');
+ cc_lib_links('FLAC', 'ogg');
cc_optimize_flags('-Wall');
}

10
audio/vorbis-tools/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.32 2007/09/15 21:26:03 simon Exp $
# $OpenBSD: Makefile,v 1.33 2007/09/18 18:26:52 naddy Exp $
COMMENT= play, encode, and manage Ogg Vorbis files
DISTNAME= vorbis-tools-1.1.1
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/vorbis/
@ -22,9 +22,9 @@ PATCH_DIST_STRIP=-p1
MODULES= devel/gettext
LIB_DEPENDS= ao.>=3::audio/libao \
curl.>=3::net/curl \
FLAC.>=7,OggFLAC.>=3::audio/flac \
speex.>=4::audio/speex \
curl.>=6::net/curl \
FLAC.>=8::audio/flac \
speex.>=6::audio/speex \
vorbis.>=4,vorbisenc.>=2,vorbisfile.>=4::audio/libvorbis
WANTLIB= c crypto idn m ogg pthread ssl z

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.8 2007/06/13 10:58:29 jakemsr Exp $
--- configure.orig Wed Jun 6 06:41:05 2007
+++ configure Fri Jun 8 17:27:46 2007
$OpenBSD: patch-configure,v 1.9 2007/09/18 18:26:52 naddy Exp $
--- configure.orig Wed Jun 6 15:41:05 2007
+++ configure Tue Sep 11 21:22:31 2007
@@ -24480,6 +24480,9 @@ _ACEOF
fi
done
@ -27,6 +27,15 @@ $OpenBSD: patch-configure,v 1.8 2007/06/13 10:58:29 jakemsr Exp $
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
@@ -37430,7 +37433,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
@@ -37681,7 +37684,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"