svn commit: r306854 - in head/multimedia/beep-media-player: . files
Jason E. Hale
jhale at FreeBSD.org
Fri Nov 2 14:08:16 UTC 2012
Author: jhale
Date: Fri Nov 2 14:08:15 2012
New Revision: 306854
URL: http://svn.freebsd.org/changeset/ports/306854
Log:
- Unbreak IPV6 option [1]
- Trim Makefile header [1]
- Pass maintainership to submitter [1]
- Add options for ALSA, OSS, GCONF, GNOMEVFS2, and NLS
- Fix 3dnow/mmx optimizations
- General Makefile cleanup - Remove WANT_GNOME,
remove unneeded REINPLACE_CMDs, whitespace cleanup
- Sort pkg-plist
PR: ports/173222 [1]
Submitted by: Chris Petrik <c.petrik.sosa at gmail.com> [1]
Approved by: makc, avilla (mentors, implicit)
Feature safe: yes
Added:
head/multimedia/beep-media-player/files/
head/multimedia/beep-media-player/files/patch-Output__alsa__audio.c (contents, props changed)
Modified:
head/multimedia/beep-media-player/Makefile (contents, props changed)
head/multimedia/beep-media-player/pkg-plist (contents, props changed)
Modified: head/multimedia/beep-media-player/Makefile
==============================================================================
--- head/multimedia/beep-media-player/Makefile Fri Nov 2 13:59:50 2012 (r306853)
+++ head/multimedia/beep-media-player/Makefile Fri Nov 2 14:08:15 2012 (r306854)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: beep
-# Date created: Thu Nov 6 19:24:01 CET 2003
-# Whom: Miguel Mendez <flynn at energyhq.es.eu.org>
-#
+# Created by: Miguel Mendez <flynn at energyhq.es.eu.org>
# $FreeBSD$
-#
PORTNAME= beep-media-player
PORTVERSION= 0.9.7.1
@@ -13,82 +9,95 @@ CATEGORIES= multimedia audio ipv6
MASTER_SITES= SF/beepmp/bmp/${PORTVERSION}
DISTNAME= bmp-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= c.petrik.sosa at gmail.com
COMMENT= GTK2 multimedia player
-USE_GNOME= gtk20 libglade2 desktopfileutils
-WANT_GNOME= yes
-USE_XORG= x11
+LIB_DEPENDS= id3-3.8:${PORTSDIR}/audio/id3lib
+
+USE_PKGCONFIG= build
+USE_GNOME= gnomehack gtk20 libglade2 desktopfileutils
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \
- OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
- VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lstdc++
-MAN1= beep-media-player.1
-
-INPUT_PLUGINS= cdaudio,mpg123,wav
-OUTPUT_PLUGINS= OSS
-VISUALIZATION_PLUGINS= blur_scope
-OPTIONS_DEFINE= VORBIS ESOUND 3DNOW IPV6
-OTPIONS_DEFAULT= VORBIS 3DNOW
-
-OPTIONS_EXCLUDE_i386= 3DNOW
+MAN1= beep-media-player.1
-3DNOW_DESC= 3DNow! optimized decoding routines
+OPTIONS_MULTI= OUTPUT
+OPTIONS_MULTI_OUTPUT= ALSA ESOUND OSS
+OPTIONS_DEFINE= NLS GCONF GNOMEVFS2 IPV6 VORBIS
+OPTIONS_DEFAULT= OSS VORBIS
.include <bsd.port.options.mk>
-# Enable IPv6 support
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.if ${PORT_OPTIONS:MIPV6}
-BROKEN= patch does not fetch
-PATCH_SITES+= http://izb.knu.ac.kr/~bh/diffs/
+PATCH_SITES+= http://ns.ael.ru/ports/distfiles/
PATCHFILES+= bmp-0.9.7-ipv6-simple.diff
PATCH_DIST_STRIP+= -p1
.endif
-CONFIGURE_ARGS+= --disable-mikmod
-PLIST_SUB+= MIKMODPLUGIN:="@comment "
+.if ${PORT_OPTIONS:MGCONF}
+USE_GNOME+= gconf2
+CONFIGURE_ARGS+=--enable-gconf
+.endif
+
+.if ${PORT_OPTIONS:MGNOMEVFS2}
+USE_GNOME+= gnomevfs2
+CONFIGURE_ARGS+=--enable-gnome-vfs
+.endif
.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
-INPUT_PLUGINS+= vorbis
-PLIST_SUB+= VORBISPLUGIN:=""
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
+PLIST_SUB+= VORBIS=""
.else
-CONFIGURE_ARGS+= --disable-vorbis
-PLIST_SUB+= VORBISPLUGIN:="@comment "
+CONFIGURE_ARGS+=--disable-vorbis
+PLIST_SUB+= VORBIS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+PLIST_SUB+= ALSA=""
+.else
+CONFIGURE_ARGS+=--disable-alsa
+PLIST_SUB+= ALSA="@comment "
.endif
.if ${PORT_OPTIONS:MESOUND}
USE_GNOME+= esound
-OUTPUT_PLUGINS+= esd
-PLIST_SUB+= ESDPLUGIN:=""
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
+PLIST_SUB+= ESOUND=""
.else
-PKGNAMESUFFIX= -esound
+CONFIGURE_ARGS+=--disable-esd
+PLIST_SUB+= ESOUND="@comment "
.endif
+
+.if ${PORT_OPTIONS:MOSS}
+PLIST_SUB+= OSS=""
.else
-CONFIGURE_ARGS+= --disable-esd
-PLIST_SUB+= ESDPLUGIN:="@comment "
+CONFIGURE_ARGS+=--disable-oss
+PLIST_SUB+= OSS="@comment "
.endif
-.if ${PORT_OPTIONS:M3DNOW}
-CONFIGURE_ARGS+= --enable-3dnow
+.if ${ARCH} == i386
+.if ${MACHINE_CPU:M3dnow} || ${MACHINE_CPU:Mmmx}
+CONFIGURE_ARGS+=--enable-simd
+.endif
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
- ${WRKSRC}/configure
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
+#Fix asm comments and mnemonics for clang
+ @${FIND} ${WRKSRC} -name "*.s" -type f | ${XARGS} ${REINPLACE_CMD} \
+ -e 's|\/|#|g' -e 's|fist |fists |g' -e 's|fistp |fistps |g'
post-install:
@${MKDIR} ${PREFIX}/lib/bmp/General
Added: head/multimedia/beep-media-player/files/patch-Output__alsa__audio.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/beep-media-player/files/patch-Output__alsa__audio.c Fri Nov 2 14:08:15 2012 (r306854)
@@ -0,0 +1,49 @@
+--- ./Output/alsa/audio.c.orig 2012-11-01 11:14:01.000000000 -0400
++++ ./Output/alsa/audio.c 2012-11-01 11:15:25.000000000 -0400
+@@ -47,7 +47,7 @@
+ static snd_mixer_elem_t *pcm_element = NULL;
+ static snd_mixer_t *mixer = NULL;
+
+-static gboolean mmap, going = FALSE, paused, multi_thread, mixer_start = TRUE;;
++static gboolean mmap_bool, going = FALSE, paused, multi_thread, mixer_start = TRUE;;
+
+ static gboolean alsa_can_pause;
+
+@@ -691,7 +691,7 @@
+ if (alsa_cfg.soft_volume)
+ volume_adjust(data, length, outputf->xmms_format, outputf->channels);
+
+- if (mmap)
++ if (mmap_bool)
+ alsa_mmap_audio(data, length);
+ else
+ alsa_write_audio(data, length);
+@@ -900,7 +900,7 @@
+ if (alsa_cfg.debug)
+ snd_output_stdio_attach(&logs, stdout, 0);
+
+- mmap = alsa_cfg.mmap;
++ mmap_bool = alsa_cfg.mmap;
+
+ if (alsa_setup(inputf) < 0) {
+ alsa_close();
+@@ -1036,16 +1036,16 @@
+ return -1;
+ }
+
+- if (mmap &&
++ if (mmap_bool &&
+ (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams,
+ SND_PCM_ACCESS_MMAP_INTERLEAVED))
+ < 0) {
+ g_message("alsa_setup(): Cannot set mmap'ed mode: %s. "
+ "falling back to direct write", snd_strerror(-err));
+- mmap = 0;
++ mmap_bool = 0;
+ }
+
+- if (!mmap &&
++ if (!mmap_bool &&
+ (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams,
+ SND_PCM_ACCESS_RW_INTERLEAVED)) <
+ 0) {
Modified: head/multimedia/beep-media-player/pkg-plist
==============================================================================
--- head/multimedia/beep-media-player/pkg-plist Fri Nov 2 13:59:50 2012 (r306853)
+++ head/multimedia/beep-media-player/pkg-plist Fri Nov 2 14:08:15 2012 (r306854)
@@ -1,102 +1,105 @@
bin/beep-media-player
include/bmp/beepctrl.h
+include/bmp/configdb.h
include/bmp/configfile.h
include/bmp/dirbrowser.h
include/bmp/formatter.h
include/bmp/fullscreen.h
include/bmp/plugin.h
+include/bmp/rcfile.h
include/bmp/titlestring.h
include/bmp/util.h
include/bmp/vfs.h
-include/bmp/rcfile.h
-include/bmp/configdb.h
-lib/libbeep.a
-lib/libbeep.la
-lib/libbeep.so
-lib/libbeep.so.2
lib/bmp/Input/libcdaudio.a
lib/bmp/Input/libcdaudio.la
lib/bmp/Input/libcdaudio.so
lib/bmp/Input/libmpg123.a
lib/bmp/Input/libmpg123.la
lib/bmp/Input/libmpg123.so
-%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.a
-%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.la
-%%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.so
+%%VORBIS%%lib/bmp/Input/libvorbis.a
+%%VORBIS%%lib/bmp/Input/libvorbis.la
+%%VORBIS%%lib/bmp/Input/libvorbis.so
lib/bmp/Input/libwav.a
lib/bmp/Input/libwav.la
lib/bmp/Input/libwav.so
-lib/bmp/Output/libOSS.a
-lib/bmp/Output/libOSS.la
-lib/bmp/Output/libOSS.so
-%%ESDPLUGIN:%%lib/bmp/Output/libesdout.a
-%%ESDPLUGIN:%%lib/bmp/Output/libesdout.la
-%%ESDPLUGIN:%%lib/bmp/Output/libesdout.so
+%%ALSA%%lib/bmp/Output/libALSA.a
+%%ALSA%%lib/bmp/Output/libALSA.la
+%%ALSA%%lib/bmp/Output/libALSA.so
+%%OSS%%lib/bmp/Output/libOSS.a
+%%OSS%%lib/bmp/Output/libOSS.la
+%%OSS%%lib/bmp/Output/libOSS.so
+%%ESOUND%%lib/bmp/Output/libesdout.a
+%%ESOUND%%lib/bmp/Output/libesdout.la
+%%ESOUND%%lib/bmp/Output/libesdout.so
lib/bmp/Visualization/libbscope.a
lib/bmp/Visualization/libbscope.la
lib/bmp/Visualization/libbscope.so
+lib/libbeep.a
+lib/libbeep.la
+lib/libbeep.so
+lib/libbeep.so.2
libdata/pkgconfig/bmp.pc
share/applications/bmp.desktop
+share/bmp/Skins/Default/README
share/bmp/Skins/Default/balance.bmp
+share/bmp/Skins/Default/cbuttons.bmp
share/bmp/Skins/Default/eq_ex.bmp
share/bmp/Skins/Default/eqmain.bmp
share/bmp/Skins/Default/main.bmp
share/bmp/Skins/Default/monoster.bmp
share/bmp/Skins/Default/nums_ex.bmp
+share/bmp/Skins/Default/playpaus.bmp
share/bmp/Skins/Default/pledit.bmp
+share/bmp/Skins/Default/pledit.txt
share/bmp/Skins/Default/posbar.bmp
share/bmp/Skins/Default/shufrep.bmp
share/bmp/Skins/Default/text.bmp
share/bmp/Skins/Default/titlebar.bmp
-share/bmp/Skins/Default/volume.bmp
-share/bmp/Skins/Default/cbuttons.bmp
-share/bmp/Skins/Default/playpaus.bmp
-share/bmp/Skins/Default/pledit.txt
share/bmp/Skins/Default/viscolor.txt
-share/bmp/Skins/Default/README
+share/bmp/Skins/Default/volume.bmp
share/bmp/glade/addfiles.glade
share/bmp/glade/prefswin.glade
share/bmp/images/appearance.png
+share/bmp/images/eq.png
share/bmp/images/mouse.png
share/bmp/images/playlist.png
share/bmp/images/plugins.png
-share/bmp/images/eq.png
-share/locale/br/LC_MESSAGES/bmp.mo
-share/locale/cs/LC_MESSAGES/bmp.mo
-share/locale/cy/LC_MESSAGES/bmp.mo
-share/locale/de/LC_MESSAGES/bmp.mo
-share/locale/el/LC_MESSAGES/bmp.mo
-share/locale/es/LC_MESSAGES/bmp.mo
-share/locale/fr/LC_MESSAGES/bmp.mo
-share/locale/hu/LC_MESSAGES/bmp.mo
-share/locale/it/LC_MESSAGES/bmp.mo
-share/locale/ja/LC_MESSAGES/bmp.mo
-share/locale/ko/LC_MESSAGES/bmp.mo
-share/locale/lt/LC_MESSAGES/bmp.mo
-share/locale/mk/LC_MESSAGES/bmp.mo
-share/locale/nl/LC_MESSAGES/bmp.mo
-share/locale/pl/LC_MESSAGES/bmp.mo
-share/locale/pt_BR/LC_MESSAGES/bmp.mo
-share/locale/ro/LC_MESSAGES/bmp.mo
-share/locale/ru/LC_MESSAGES/bmp.mo
-share/locale/sk/LC_MESSAGES/bmp.mo
-share/locale/sv/LC_MESSAGES/bmp.mo
-share/locale/zh_CN/LC_MESSAGES/bmp.mo
-share/locale/fi/LC_MESSAGES/bmp.mo
-share/locale/hi/LC_MESSAGES/bmp.mo
-share/locale/ka/LC_MESSAGES/bmp.mo
-share/locale/uk/LC_MESSAGES/bmp.mo
-share/locale/zh_TW/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/br/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/el/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/bmp.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/bmp.mo
share/pixmaps/bmp.png
- at dirrmtry share/applications
- at exec mkdir -p %D/share/beep/Skins
- at dirrm share/beep/Skins
- at dirrm share/beep
+ at dirrm share/bmp/images
+ at dirrm share/bmp/glade
@dirrm share/bmp/Skins/Default
@dirrm share/bmp/Skins
- at dirrm share/bmp/glade
- at dirrm share/bmp/images
@dirrm share/bmp
+ at exec mkdir -p %D/share/beep/Skins
+ at dirrm share/beep/Skins
+ at dirrm share/beep
+ at dirrmtry share/applications
@dirrm lib/bmp/Visualization
@dirrm lib/bmp/Output
@dirrm lib/bmp/Input
More information about the svn-ports-head
mailing list