- remove sparc64 gcc3.3 workaround

- this should be SHARED_ONLY, add and rework PLISTs
- minor update while there
- better license marker
from Brad.

- remove bogus PERMIT_DISTFILES_*-mp3, this variable is not per-subpackage
- set PERMIT_PACKAGE_CDROM-mp3
from me.
This commit is contained in:
sthen 2010-06-19 20:21:14 +00:00
parent 3f23754c82
commit 57ab4ef3bc
12 changed files with 72 additions and 121 deletions

View File

@ -1,39 +1,37 @@
# $OpenBSD: Makefile,v 1.28 2009/12/22 15:43:14 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.29 2010/06/19 20:21:14 sthen Exp $
COMMENT-main= gtk+2 media player based on XMMS SHARED_ONLY= Yes
COMMENT-mp3= MP3 input plugin for bmp
COMMENT-vorbis= Ogg Vorbis input plugin for bmp COMMENT-main= Gtk+2 media player based on XMMS
V= 0.9.7 COMMENT-mp3= MP3 input plugin for BMP
COMMENT-vorbis= Ogg Vorbis input plugin for BMP
V= 0.9.7.1
DISTNAME= bmp-$V DISTNAME= bmp-$V
PKGNAME-main= bmp-$Vp16 PKGNAME-main= bmp-$V
PKGNAME-mp3= bmp-mp3-$Vp14 PKGNAME-mp3= bmp-mp3-$V
PKGNAME-vorbis= bmp-vorbis-$Vp14 PKGNAME-vorbis= bmp-vorbis-$V
SHARED_LIBS += beep 2.0 # .2.0
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=beepmp/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=beepmp/}
HOMEPAGE= http://bmp.beep-media-player.org/ SHARED_LIBS= beep 2.1
# GPL HOMEPAGE= http://sourceforge.net/projects/beepmp/
# GPLv2+
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM-mp3= patents
.if ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* gcc-*
.endif
USE_LIBTOOL= Yes
USE_X11= Yes
MODULES= devel/gettext
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
freetype gio-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ freetype gio-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \
xcb z xcb xcb-render xcb-render-util z
MODULES= devel/gettext
LIB_DEPENDS= gdk_pixbuf-2.0.>=400.3,gdk-x11-2.0.>=400.3,gtk-x11-2.0.>=0.5::x11/gtk+2 \ LIB_DEPENDS= gdk_pixbuf-2.0.>=400.3,gdk-x11-2.0.>=400.3,gtk-x11-2.0.>=0.5::x11/gtk+2 \
glib-2.0.>=400.2,gthread-2.0.>=400.2::devel/glib2 glib-2.0.>=400.2,gthread-2.0.>=400.2::devel/glib2
@ -49,13 +47,6 @@ MULTI_PACKAGES+=-mp3
MULTI_PACKAGES+=-vorbis MULTI_PACKAGES+=-vorbis
.endif .endif
.if !${MULTI_PACKAGES:M-mp3}
CONFIGURE_ARGS+=--disable-mp3
.endif
.if !${MULTI_PACKAGES:M-vorbis}
CONFIGURE_ARGS+=--disable-vorbis
.endif
RUN_DEPENDS-main=${RUN_DEPENDS} \ RUN_DEPENDS-main=${RUN_DEPENDS} \
:desktop-file-utils-*:devel/desktop-file-utils :desktop-file-utils-*:devel/desktop-file-utils
LIB_DEPENDS-main=${LIB_DEPENDS} \ LIB_DEPENDS-main=${LIB_DEPENDS} \
@ -65,9 +56,6 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
LIB_DEPENDS-vorbis=${LIB_DEPENDS} \ LIB_DEPENDS-vorbis=${LIB_DEPENDS} \
vorbisfile.>=4.0,vorbis::audio/libvorbis vorbisfile.>=4.0,vorbis::audio/libvorbis
PERMIT_DISTFILES_CDROM-mp3= patent issues
PERMIT_DISTFILES_FTP-mp3= patent issues
LIB_DEPENDS-mp3=${LIB_DEPENDS} \ LIB_DEPENDS-mp3=${LIB_DEPENDS} \
beep::${BUILD_PKGPATH} beep::${BUILD_PKGPATH}
@ -76,9 +64,10 @@ WANTLIB-vorbis= ${WANTLIB} ogg
RUN_DEPENDS-vorbis= ::${BUILD_PKGPATH} RUN_DEPENDS-vorbis= ::${BUILD_PKGPATH}
WANTLIB-main= ${WANTLIB} ICE SM pthread audiofile c sndio WANTLIB-main= ${WANTLIB} ICE SM pthread audiofile c sndio
WRKDIST= ${WRKDIR}/bmp-0.9.7 USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE=gnu USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+=--disable-alsa \ CONFIGURE_ARGS+=--disable-alsa \
--disable-oss --disable-oss

View File

@ -1,5 +1,5 @@
MD5 (bmp-0.9.7.tar.gz) = XXQRP13j0RpADR1sEY1BwA== MD5 (bmp-0.9.7.1.tar.gz) = wl1ajUnMWFHRPVJaIAI8TA==
RMD160 (bmp-0.9.7.tar.gz) = r6rmSg7FWFeEkQjx0G2t0q3Dod4= RMD160 (bmp-0.9.7.1.tar.gz) = kogIORiRPKl6uIg9YWFZBVkxrec=
SHA1 (bmp-0.9.7.tar.gz) = pgrDN++wD2pQzgGeigc3Ck3wQMI= SHA1 (bmp-0.9.7.1.tar.gz) = q2REuaNai7jpIKeB5y2WOj+2BUc=
SHA256 (bmp-0.9.7.tar.gz) = e0WLbKUcXxwBzjKK7aq4HnECjHltN6lTWC4N61WYDFE= SHA256 (bmp-0.9.7.1.tar.gz) = IWXIpNTz165VgexDqWdi/QKj1NEacDRyXdErk1LRjVk=
SIZE (bmp-0.9.7.tar.gz) = 1974397 SIZE (bmp-0.9.7.1.tar.gz) = 2056564

View File

@ -1,17 +0,0 @@
$OpenBSD: gcc-Input_mpg123_Makefile_in,v 1.1 2005/08/16 18:22:26 sturm Exp $
--- Input/mpg123/Makefile.in.orig Sun Aug 14 04:30:24 2005
+++ Input/mpg123/Makefile.in Sun Aug 14 04:32:15 2005
@@ -457,6 +457,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+layer3.lo: layer3.c
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -O0 -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
.s.o:
$(CCASCOMPILE) -c $<

View File

@ -1,2 +1,2 @@
BMP is a multimedia player that currently uses a skinned user interface BMP is a multimedia player that currently uses a skinned user interface
based on Winamp 2.x skins. It is based on ("forked off") XMMS. based on Winamp 2.x skins. It is based on ("forked") XMMS.

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 132 B

View File

@ -1 +1 @@
Plays MP3 audio files and HTTP streams from bmp. Plays MP3 audio files and HTTP streams from BMP.

View File

@ -1 +1 @@
Plays Ogg Vorbis files and HTTP streams from bmp. Plays Ogg Vorbis files and HTTP streams from BMP.

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/26 00:10:26 espie Exp $
lib/bmp/Input/libcdaudio.so
lib/bmp/Input/libwav.so
lib/bmp/Output/libesdout.so
lib/bmp/Visualization/libbscope.so
@lib lib/libbeep.so.${LIBbeep_VERSION}

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-mp3,v 1.1.1.1 2004/12/19 07:59:24 jolan Exp $
lib/bmp/Input/libmpg123.so

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-vorbis,v 1.1.1.1 2004/12/19 07:59:24 jolan Exp $
lib/bmp/Input/libvorbis.so

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.3 2009/12/22 15:43:14 ajacoutot Exp $ @comment $OpenBSD: PLIST-main,v 1.4 2010/06/19 20:21:14 sthen Exp $
@pkgpath audio/bmp @pkgpath audio/bmp
@pkgpath audio/bmp,no_mp3 @pkgpath audio/bmp,no_mp3
@pkgpath audio/bmp,no_vorbis @pkgpath audio/bmp,no_vorbis
@pkgpath audio/bmp,no_mp3,no_vorbis @pkgpath audio/bmp,no_mp3,no_vorbis
bin/beep-media-player @bin bin/beep-media-player
include/bmp/ include/bmp/
include/bmp/beepctrl.h include/bmp/beepctrl.h
include/bmp/configdb.h include/bmp/configdb.h
@ -18,46 +18,41 @@ include/bmp/util.h
include/bmp/vfs.h include/bmp/vfs.h
lib/bmp/ lib/bmp/
lib/bmp/Input/ lib/bmp/Input/
@comment lib/bmp/Input/libcdaudio.a
@comment lib/bmp/Input/libcdaudio.la @comment lib/bmp/Input/libcdaudio.la
lib/bmp/Input/libwav.a lib/bmp/Input/libcdaudio.so
lib/bmp/Input/libwav.la @comment lib/bmp/Input/libwav.la
lib/bmp/Input/libwav.so
lib/bmp/Output/ lib/bmp/Output/
lib/bmp/Output/libesdout.a @comment lib/bmp/Output/libesdout.la
lib/bmp/Output/libesdout.la lib/bmp/Output/libesdout.so
lib/bmp/Visualization/ lib/bmp/Visualization/
lib/bmp/Visualization/libbscope.a @comment lib/bmp/Visualization/libbscope.la
lib/bmp/Visualization/libbscope.la lib/bmp/Visualization/libbscope.so
lib/libbeep.a @comment lib/libbeep.la
lib/libbeep.la @lib lib/libbeep.so.${LIBbeep_VERSION}
lib/pkgconfig/
lib/pkgconfig/bmp.pc lib/pkgconfig/bmp.pc
@man man/man1/beep-media-player.1 @man man/man1/beep-media-player.1
share/applications/
share/applications/bmp.desktop share/applications/bmp.desktop
share/bmp/ share/bmp/
share/bmp/Skins/ share/bmp/Skins/
share/bmp/Skins/Default/ share/bmp/Skins/Default/
share/bmp/Skins/Default/Avs.bmp share/bmp/Skins/Default/README
share/bmp/Skins/Default/Balance.bmp share/bmp/Skins/Default/balance.bmp
share/bmp/Skins/Default/Eq_ex.bmp share/bmp/Skins/Default/cbuttons.bmp
share/bmp/Skins/Default/Eqmain.bmp share/bmp/Skins/Default/eq_ex.bmp
share/bmp/Skins/Default/Main.bmp share/bmp/Skins/Default/eqmain.bmp
share/bmp/Skins/Default/Mb.bmp share/bmp/Skins/Default/main.bmp
share/bmp/Skins/Default/Monoster.bmp share/bmp/Skins/Default/monoster.bmp
share/bmp/Skins/Default/Nums_ex.bmp share/bmp/Skins/Default/nums_ex.bmp
share/bmp/Skins/Default/Pledit.bmp share/bmp/Skins/Default/playpaus.bmp
share/bmp/Skins/Default/Posbar.bmp share/bmp/Skins/Default/pledit.bmp
share/bmp/Skins/Default/Shufrep.bmp share/bmp/Skins/Default/pledit.txt
share/bmp/Skins/Default/Text.bmp share/bmp/Skins/Default/posbar.bmp
share/bmp/Skins/Default/Titlebar.bmp share/bmp/Skins/Default/shufrep.bmp
share/bmp/Skins/Default/Volume.bmp share/bmp/Skins/Default/text.bmp
share/bmp/Skins/Default/cButtons.bmp share/bmp/Skins/Default/titlebar.bmp
share/bmp/Skins/Default/pLaypaus.bmp share/bmp/Skins/Default/viscolor.txt
share/bmp/Skins/Default/pLedit.txt share/bmp/Skins/Default/volume.bmp
share/bmp/Skins/Default/readme.txt
share/bmp/Skins/Default/screenshot.bmp
share/bmp/Skins/Default/vIscolor.txt
share/bmp/glade/ share/bmp/glade/
share/bmp/glade/addfiles.glade share/bmp/glade/addfiles.glade
share/bmp/glade/prefswin.glade share/bmp/glade/prefswin.glade
@ -67,28 +62,21 @@ share/bmp/images/eq.png
share/bmp/images/mouse.png share/bmp/images/mouse.png
share/bmp/images/playlist.png share/bmp/images/playlist.png
share/bmp/images/plugins.png share/bmp/images/plugins.png
share/icons/
share/icons/bmp.svg
share/locale/br/
share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/bmp.mo share/locale/br/LC_MESSAGES/bmp.mo
share/locale/cs/LC_MESSAGES/bmp.mo share/locale/cs/LC_MESSAGES/bmp.mo
share/locale/cy/
share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/bmp.mo share/locale/cy/LC_MESSAGES/bmp.mo
share/locale/de/LC_MESSAGES/bmp.mo share/locale/de/LC_MESSAGES/bmp.mo
share/locale/el/LC_MESSAGES/bmp.mo share/locale/el/LC_MESSAGES/bmp.mo
share/locale/es/LC_MESSAGES/bmp.mo share/locale/es/LC_MESSAGES/bmp.mo
share/locale/fi/LC_MESSAGES/bmp.mo
share/locale/fr/LC_MESSAGES/bmp.mo share/locale/fr/LC_MESSAGES/bmp.mo
share/locale/hi/LC_MESSAGES/bmp.mo
share/locale/hu/LC_MESSAGES/bmp.mo share/locale/hu/LC_MESSAGES/bmp.mo
share/locale/it/LC_MESSAGES/bmp.mo share/locale/it/LC_MESSAGES/bmp.mo
share/locale/ja/LC_MESSAGES/bmp.mo share/locale/ja/LC_MESSAGES/bmp.mo
share/locale/ka/LC_MESSAGES/bmp.mo
share/locale/ko/LC_MESSAGES/bmp.mo share/locale/ko/LC_MESSAGES/bmp.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/bmp.mo share/locale/lt/LC_MESSAGES/bmp.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/bmp.mo share/locale/mk/LC_MESSAGES/bmp.mo
share/locale/nl/LC_MESSAGES/bmp.mo share/locale/nl/LC_MESSAGES/bmp.mo
share/locale/pl/LC_MESSAGES/bmp.mo share/locale/pl/LC_MESSAGES/bmp.mo
@ -97,7 +85,10 @@ share/locale/ro/LC_MESSAGES/bmp.mo
share/locale/ru/LC_MESSAGES/bmp.mo share/locale/ru/LC_MESSAGES/bmp.mo
share/locale/sk/LC_MESSAGES/bmp.mo share/locale/sk/LC_MESSAGES/bmp.mo
share/locale/sv/LC_MESSAGES/bmp.mo share/locale/sv/LC_MESSAGES/bmp.mo
share/locale/uk/LC_MESSAGES/bmp.mo
share/locale/zh_CN/LC_MESSAGES/bmp.mo share/locale/zh_CN/LC_MESSAGES/bmp.mo
%%SHARED%%
@exec %D/bin/update-desktop-database @exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database
share/locale/zh_TW/LC_MESSAGES/bmp.mo
share/pixmaps/
share/pixmaps/bmp.png

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-mp3,v 1.1.1.1 2004/12/19 07:59:24 jolan Exp $ @comment $OpenBSD: PLIST-mp3,v 1.2 2010/06/19 20:21:14 sthen Exp $
lib/bmp/Input/libmpg123.a @comment lib/bmp/Input/libmpg123.la
lib/bmp/Input/libmpg123.la lib/bmp/Input/libmpg123.so
%%SHARED%%

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-vorbis,v 1.1.1.1 2004/12/19 07:59:24 jolan Exp $ @comment $OpenBSD: PLIST-vorbis,v 1.2 2010/06/19 20:21:14 sthen Exp $
lib/bmp/Input/libvorbis.a @comment lib/bmp/Input/libvorbis.la
lib/bmp/Input/libvorbis.la lib/bmp/Input/libvorbis.so
%%SHARED%%