diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-26 02:28:48 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-26 02:28:48 +0800 |
commit | cf51f55398c42dd9bada5df6310bcac43d14863b (patch) | |
tree | 11ce3450316db244b5d748a5744ac49ac38b77a6 /audio/gnome-media | |
parent | b45a90ccb1d7956c11c3c0de7fa000c4bed732de (diff) | |
download | marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.gz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.bz2 marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.lz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.xz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.zst marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.zip |
Update to 2.5.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1376 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/gnome-media')
-rw-r--r-- | audio/gnome-media/Makefile | 9 | ||||
-rw-r--r-- | audio/gnome-media/distinfo | 2 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-ad | 31 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-gmix::prefs.c | 11 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-gmix_gmix.h | 11 | ||||
-rw-r--r-- | audio/gnome-media/pkg-plist | 20 |
6 files changed, 14 insertions, 70 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index b7c96f91c..8b9cb9441 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.4.1.1 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.4 +MASTER_SITE_SUBDIR= sources/gnome-media/2.5 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -LIB_DEPENDS= gstplay-0.7.1:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes @@ -27,7 +25,8 @@ USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop gail \ + gstreamerplugins CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 2f82f09ac..fdd989227 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-media-2.4.1.1.tar.bz2) = dce73f3f0e5bddfd5a2bd412900e5abe +MD5 (gnome2/gnome-media-2.5.1.tar.bz2) = f46d0c09ee6b2d1791d52ed23f811f09 diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad deleted file mode 100644 index f49a888a5..000000000 --- a/audio/gnome-media/files/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ ---- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 -+++ gmix/gmix.c Fri Oct 11 09:20:13 2002 -@@ -60,7 +60,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - -@@ -722,6 +722,7 @@ - - cnt = 0; - devices = NULL; -+ num_mixers = 0; - device_by_name = g_hash_table_new (g_str_hash, g_str_equal); - - do { -@@ -730,9 +731,8 @@ - devices = g_list_append (devices, new_device); - g_hash_table_insert (device_by_name, new_device->info.name, new_device); - } -- } while (new_device); -- -- num_mixers = cnt - 1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - device_info * diff --git a/audio/gnome-media/files/patch-gmix::prefs.c b/audio/gnome-media/files/patch-gmix::prefs.c deleted file mode 100644 index b25b42b97..000000000 --- a/audio/gnome-media/files/patch-gmix::prefs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/prefs.c.orig Tue May 7 00:52:42 2002 -+++ gmix/prefs.c Tue May 7 00:52:54 2002 -@@ -38,7 +38,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - diff --git a/audio/gnome-media/files/patch-gmix_gmix.h b/audio/gnome-media/files/patch-gmix_gmix.h deleted file mode 100644 index 600110df6..000000000 --- a/audio/gnome-media/files/patch-gmix_gmix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/gmix.h.orig Sat Aug 16 15:13:57 2003 -+++ gmix/gmix.h Sat Aug 16 15:14:47 2003 -@@ -25,7 +25,7 @@ - */ - #define GMIX_VERSION 0x030000 - --#if defined(ALSA) || defined(__FreeBSD__) -+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO)) - /* stolen from OSS's soundcard.h */ - typedef struct mixer_info - { diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 47d38d6ba..123b59f51 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -1,23 +1,20 @@ bin/cddb-slave2-properties bin/gnome-cd bin/gnome-sound-recorder -bin/gnome-volume-control +bin/gst-mixer bin/gstreamer-properties bin/vumeter etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml etc/gconf/schemas/CDDB-Slave2.schemas etc/gconf/schemas/gnome-cd.schemas etc/gconf/schemas/gnome-sound-recorder.schemas -etc/gconf/schemas/gnome-volume-control.schemas include/cddb-slave2/cddb-slave-client.h lib/libcddb-slave2.a lib/libcddb-slave2.so @@ -28,12 +25,13 @@ libexec/cddb-track-editor share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/gnome-media-2.0/icons/gstreamer-properties.png -share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade share/gnome/gnome-sound-recorder/ui/gsr.xml +share/gnome/gstreamer-properties/glade/gstreamer-properties.glade +share/gnome/gstreamer-properties/icons/gstreamer-properties.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png @@ -408,6 +406,10 @@ share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png share/gnome/pixmaps/gnome-vumeter.png share/gnome/pixmaps/gstreamer-properties.png +share/gnome/pixmaps/mixer.png +share/gnome/pixmaps/phone.png +share/gnome/pixmaps/tone.png +share/gnome/pixmaps/video.png share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/az/LC_MESSAGES/gnome-media-2.0.mo @@ -456,6 +458,7 @@ share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo @@ -470,9 +473,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes/None @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd -@dirrm share/gnome/gnome-media-2.0/interfaces -@dirrm share/gnome/gnome-media-2.0/icons -@dirrm share/gnome/gnome-media-2.0 @dirrm share/gnome/gnome-sound-recorder/ui @dirrm share/gnome/gnome-sound-recorder @dirrm share/gnome/help/grecord/zh_TW/figures @@ -522,12 +522,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd @dirrm include/cddb-slave2 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2 -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd |