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

libpthread doesn't need to be, and is no longer linked into

Browse Source 
xmms modules.

adjust WANTLIBs, bump PKGNAMEs.
This commit is contained in:
jakemsr 2007-12-11 11:00:37 +00:00
parent cb3832e975
commit 839b8918bc
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/faad/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2007/09/15 21:26:01 simon Exp $
# $OpenBSD: Makefile,v 1.35 2007/12/11 11:00:37 jakemsr Exp $
COMMENT-main= MPEG2 and MPEG-4 AAC decoder
COMMENT-xmms= XMMS input plugin for AAC files
DISTNAME= faad2-2.0
PKGNAME-main= faad-2.0p6
PKGNAME-xmms= faad-xmms-2.0p5
PKGNAME-xmms= faad-xmms-2.0p6
CATEGORIES= audio
MASTER_SITES= http://mirrors.protection.cx/~jolan/
SHARED_LIBS += faad 1.0 # .0.0
@ -50,8 +50,8 @@ LIB_DEPENDS-xmms= xmms.>=3::audio/xmms \
faad,mp4v2::audio/faad
RUN_DEPENDS-xmms= ::audio/xmms
WANTLIB-xmms= ${WANTLIB} \
X11 Xau Xdmcp Xext Xi pthread iconv intl glib \
gmodule gtk gdk
X11 Xau Xdmcp Xext Xi iconv intl glib \
gmodule gthread gtk gdk
WANTLIB-main= ${WANTLIB} c

13
audio/faad/patches/patch-plugins_xmms_src_Makefile_am
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plugins_xmms_src_Makefile_am,v 1.1 2004/12/09 04:57:56 jcs Exp $
--- plugins/xmms/src/Makefile.am.orig Wed Dec 8 17:22:53 2004
+++ plugins/xmms/src/Makefile.am Wed Dec 8 17:25:08 2004
$OpenBSD: patch-plugins_xmms_src_Makefile_am,v 1.2 2007/12/11 11:00:37 jakemsr Exp $
--- plugins/xmms/src/Makefile.am.orig Fri Feb 6 08:05:07 2004
+++ plugins/xmms/src/Makefile.am Sun Oct 21 02:19:37 2007
@@ -1,7 +1,7 @@
libdir = `$(XMMS_CONFIG) --input-plugin-dir`
lib_LTLIBRARIES = libmp4.la
@ -10,3 +10,10 @@ $OpenBSD: patch-plugins_xmms_src_Makefile_am,v 1.1 2004/12/09 04:57:56 jcs Exp $
`$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
-I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
@@ -9,5 +9,5 @@ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la
$(top_builddir)/common/mp4v2/libmp4v2.la
libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
+ `$(GTK_CONFIG) --libs` -lstdc++
libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c

14
audio/xmms/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2007/12/08 21:54:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.56 2007/12/11 11:00:37 jakemsr Exp $
COMMENT-main= Multimedia player for the X Window System
COMMENT-esd= Esound output plugin for XMMS
@ -11,10 +11,10 @@ SHARED_ONLY= Yes
VERSION= 1.2.11
DISTNAME= xmms-${VERSION}
PKGNAME-main= xmms-${VERSION}
PKGNAME-esd= xmms-esd-${VERSION}
PKGNAME-vorbis= xmms-vorbis-${VERSION}
PKGNAME-mikmod= xmms-mikmod-${VERSION}
PKGNAME-mp3= xmms-mp3-${VERSION}
PKGNAME-esd= xmms-esd-${VERSION}p0
PKGNAME-vorbis= xmms-vorbis-${VERSION}p0
PKGNAME-mikmod= xmms-mikmod-${VERSION}p0
PKGNAME-mp3= xmms-mp3-${VERSION}p0
SHARED_LIBS= xmms 4.2
CATEGORIES= audio
HOMEPAGE= http://www.xmms.org
@ -26,7 +26,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xext Xi glib gmodule m pthread
WANTLIB= X11 Xau Xdmcp Xext Xi glib gmodule m
V= 1.2.x
MASTER_SITES= ${HOMEPAGE}/files/$V/ \
@ -55,7 +55,7 @@ MULTI_PACKAGES+= -mp3
PATCH_LIST= patch-* gcc-*
.endif
WANTLIB-main= ${WANTLIB} GL ICE c Xxf86vm SM
WANTLIB-main= ${WANTLIB} GL ICE c Xxf86vm SM pthread
MODULES= devel/gettext
RUN_DEPENDS= :unzip-*:archivers/unzip