diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2007-06-07 14:04:25 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2007-06-07 14:04:25 +0000 |
commit | 794f096bf9bd73aab6d500a04feda040ab8029c8 (patch) | |
tree | 8bd506e71c6e6bac8cc09be08e242acdcf4a58eb | |
parent | - Add gstreamer-plugins-mp3 (diff) |
Switch from using mad to mp3 in USE_GSTREAMER
Notes
Notes:
svn path=/head/; revision=193013
-rw-r--r-- | Mk/bsd.gstreamer.mk | 8 | ||||
-rw-r--r-- | audio/gstreamer-plugins-moodbar/Makefile | 4 | ||||
-rw-r--r-- | audio/rhythmbox-devel/Makefile | 3 | ||||
-rw-r--r-- | audio/rhythmbox/Makefile | 3 | ||||
-rw-r--r-- | multimedia/bmpx/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins-all/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins-core/Makefile | 4 | ||||
-rw-r--r-- | multimedia/quodlibet/Makefile | 3 | ||||
-rw-r--r-- | sysutils/gnomebaker/Makefile | 4 |
9 files changed, 21 insertions, 16 deletions
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index c578b7b0afb0..5fdda4643fb9 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -53,15 +53,15 @@ GST_SHLIB_VERSION= 1 # # These are the current supported gstreamer-plugins modules # -_USE_GSTREAMER_ALL= a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \ +_USE_GSTREAMER10_ALL= a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \ dv dvd esound faac faad ffmpeg flac gconf gnomevfs \ gnonlin good gsm hal ivorbis jack jpeg ladspa lame \ - libcaca libmms libpng libvisual mad mpeg2enc mpeg2dec \ + libcaca libmms libpng libvisual mp3 mpeg2enc mpeg2dec \ musepack neon ogg pango pulse python sdl shout2 sidplay \ spc speex swfdec theora ugly vorbis wavpack xvid # other plugins -OTHER_GSTREAMER_PLUGINS+= core yes +OTHER_GSTREAMER_PLUGINS+= core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad _USE_GSTREAMER_ALL+= ${OTHER_GSTREAMER_PLUGINS} @@ -94,6 +94,8 @@ faad_DEPENDS= audio/gstreamer-plugins-faad flac_DEPENDS= audio/gstreamer-plugins-flac +fluendo-mp3_DEPENDS= audio/gstreamer-plugins-fluendo-mp3 + gsm_DEPENDS= audio/gstreamer-plugins-gsm ivorbis_DEPENDS= audio/gstreamer-plugins-ivorbis diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile index ca8e5a3008e7..19266b7d3bb8 100644 --- a/audio/gstreamer-plugins-moodbar/Makefile +++ b/audio/gstreamer-plugins-moodbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer-plugins-moodbar PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://pwsp.net/~qbob/ \ http://redundancy.redundancy.org/mirror/ @@ -37,7 +37,7 @@ PLIST_SUB+= VERSION="${GST_VERSION}" .include <bsd.port.pre.mk> .if defined(WITH_MP3) -USE_GSTREAMER+= mad +USE_GSTREAMER+= mp3 .endif .if defined(WITH_OGG) diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index aa451e5b0e8c..92616f17a48b 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -31,7 +32,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner WANT_GNOME= yes -USE_GSTREAMER= flac mad gnomevfs gconf jpeg +USE_GSTREAMER= flac mp3 gnomevfs gconf jpeg USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10 INSTALLS_ICONS= yes diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index aa451e5b0e8c..92616f17a48b 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -8,6 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -31,7 +32,7 @@ INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner WANT_GNOME= yes -USE_GSTREAMER= flac mad gnomevfs gconf jpeg +USE_GSTREAMER= flac mp3 gnomevfs gconf jpeg USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10 INSTALLS_ICONS= yes diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 4b42c4a6651e..6aafd9306876 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.36.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://files.beep-media-player.org/releases/0.36/ @@ -35,7 +35,7 @@ USE_GCC= 3.4+ USE_GMAKE= yes USE_GNOME= gtk20 libglade2 desktopfileutils INSTALLS_ICONS= yes -USE_GSTREAMER= good mad ogg vorbis cdparanoia +USE_GSTREAMER= good mp3 ogg vorbis cdparanoia USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-hal \ diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile index 5f7ba2276a2b..1b28135c5225 100644 --- a/multimedia/gstreamer-plugins-all/Makefile +++ b/multimedia/gstreamer-plugins-all/Makefile @@ -8,7 +8,7 @@ PORTNAME= gstreamer-plugins-all PORTVERSION= 1.3.${GST_VERSION}.${GST_SHLIB_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= # empty DISTFILES= # empty @@ -30,7 +30,7 @@ WITHOUT_LAME= yes # MP3 License , no package .endif # Remove core, yes -PLUGS= ${_USE_GSTREAMER_ALL:S/core//:S/yes//} +PLUGS= ${_USE_GSTREAMER10_ALL} .for all in ${PLUGS} OPTIONS+= ${all:U} "${all} plugin " on diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile index 5b16cf30791c..25c9c4887ba1 100644 --- a/multimedia/gstreamer-plugins-core/Makefile +++ b/multimedia/gstreamer-plugins-core/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer-plugins-core PORTVERSION= 0.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty @@ -25,7 +25,7 @@ WANT_GSTREAMER= yes .include <bsd.port.pre.mk> # Audio plugins -USE_GSTREAMER+= mad ogg vorbis +USE_GSTREAMER+= mp3 ogg vorbis # Graphics plugins USE_GSTREAMER+= libpng diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 11ccd42feffa..7f5a8e45e518 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -7,6 +7,7 @@ PORTNAME= quodlibet PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= multimedia audio python gnome MASTER_SITES= http://www.sacredchao.net/~piman/software/ \ http://www.tortall.net/mirrors/piman-software/ @@ -58,7 +59,7 @@ USE_GSTREAMER+= speex .endif .if !defined(WITHOUT_MP3) -USE_GSTREAMER+= mad +USE_GSTREAMER+= mp3 .endif .if !defined(WITHOUT_FLAC) diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile index 8944bc3edc95..bcf7ca0100f2 100644 --- a/sysutils/gnomebaker/Makefile +++ b/sysutils/gnomebaker/Makefile @@ -6,7 +6,7 @@ PORTNAME= gnomebaker PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomebaker @@ -26,7 +26,7 @@ USE_GMAKE= yes INSTALLS_OMF= yes USE_GCC= 3.4+ USE_GETTEXT= yes -USE_GSTREAMER= vorbis mad flac +USE_GSTREAMER= vorbis mp3 flac CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" |