pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio Update bmp and bmp-esound to 0.9.7rc2 (what a PI...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c4201085bd7d
branches: trunk
changeset: 480162:c4201085bd7d
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Tue Aug 31 15:47:56 2004 +0000
description:
Update bmp and bmp-esound to 0.9.7rc2 (what a PITA):
BMP 0.9.7 rc2
Bugfixes
* Include the file "beep/build.list" in the distribution.
BMP 0.9.7 rc1
Enhancements
* Revised GUI according to GNOME HIG
* New window icons
* New About and Preferences dialog
* New file/folder selector using GTK+ 2.4's file chooser
* Skin cursor support
* New equalizer using IIR filtering
* ID3v2 editing support using id3lib
* ID3 character encoding to assume may now be overrided
* New title formatting tag for conditional fields eg. %{n:text%}
* Experimental GConf and GNOME VFS support
* New translations (Dutch, German, Italian, Japanese, Korean, Lithuanian,
Russian, Simplified Chinese, Spanish, Swedish, Welsh)
* Merged configure scripts for shorter build time
Miscellaneous
* Removed EasyMove and DoubleSize
* Removed real-time priority support
* Removed AM_PATH_BMP m4 macro in favour of PKG_CHECK_MODULES
* Removed beep-config in favour of 'pkg-config bmp'
Bugfixes
* Memory leaks
* i18n and l10n
* Many others (see Bugzilla and ChangeLog)
diffstat:
audio/bmp-esound/Makefile | 4 +-
audio/bmp/Makefile | 6 +-
audio/bmp/Makefile.common | 18 +++-
audio/bmp/PLIST | 53 ++++++++++----
audio/bmp/distinfo | 25 ++----
audio/bmp/patches/patch-ab | 65 ------------------
audio/bmp/patches/patch-ac | 39 -----------
audio/bmp/patches/patch-ad | 73 --------------------
audio/bmp/patches/patch-ae | 22 ------
audio/bmp/patches/patch-ag | 22 ++---
audio/bmp/patches/patch-ah | 159 ---------------------------------------------
audio/bmp/patches/patch-ai | 21 -----
audio/bmp/patches/patch-aj | 45 ------------
audio/bmp/patches/patch-ak | 16 ----
audio/bmp/patches/patch-al | 17 ----
audio/bmp/patches/patch-am | 14 ---
audio/bmp/patches/patch-ao | 10 +-
audio/bmp/patches/patch-aq | 12 +-
audio/bmp/patches/patch-ar | 8 +-
audio/bmp/patches/patch-as | 12 +++
20 files changed, 101 insertions(+), 540 deletions(-)
diffs (truncated from 819 to 300 lines):
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp-esound/Makefile
--- a/audio/bmp-esound/Makefile Tue Aug 31 15:39:08 2004 +0000
+++ b/audio/bmp-esound/Makefile Tue Aug 31 15:47:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/11 18:13:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/31 15:47:56 jmmv Exp $
#
.include "../../audio/bmp/Makefile.common"
@@ -6,7 +6,7 @@
PKGNAME= ${DISTNAME:S/bmp/bmp-esound/}
CATEGORIES+= gnome
-DEPENDS+= bmp>=0.9.6:../../audio/bmp
+DEPENDS+= bmp>=0.9.7rc2:../../audio/bmp
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-esd/--enable-esd/}
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/Makefile
--- a/audio/bmp/Makefile Tue Aug 31 15:39:08 2004 +0000
+++ b/audio/bmp/Makefile Tue Aug 31 15:47:56 2004 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2004/06/26 22:12:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/31 15:47:56 jmmv Exp $
#
.include "Makefile.common"
-PKGREVISION= 1
-
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-mp3/--enable-mp3/}
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-oss/--enable-oss/}
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-vorbis/--enable-vorbis/}
+.include "../../audio/id3lib/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Tue Aug 31 15:39:08 2004 +0000
+++ b/audio/bmp/Makefile.common Tue Aug 31 15:47:56 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2004/06/26 22:12:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/08/31 15:47:56 jmmv Exp $
#
-DISTNAME= bmp-0.9.6.1
+DISTNAME= bmp-0.9.7rc2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=beepmp/}
@@ -22,15 +22,25 @@
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-esd
+CONFIGURE_ARGS+= --disable-mp3
CONFIGURE_ARGS+= --disable-opengl
CONFIGURE_ARGS+= --disable-oss
CONFIGURE_ARGS+= --disable-vorbis
PKGCONFIG_OVERRIDE+= beep.pc
+PKG_OPTIONS_VAR= PKG_OPTIONS.bmp
+PKG_SUPPORTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.prefs.mk"
-PTHREAD_OPTS+= require
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+= --enable-gconf
+CONFIGURE_ARGS+= --enable-gnome-vfs
+. include "../../devel/GConf2/buildlink3.mk"
+. include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.endif
.if ${OPSYS} == "NetBSD"
RAWPART!= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
@@ -57,8 +67,8 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/PLIST
--- a/audio/bmp/PLIST Tue Aug 31 15:39:08 2004 +0000
+++ b/audio/bmp/PLIST Tue Aug 31 15:47:56 2004 +0000
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/11 18:10:59 jmmv Exp $
-bin/beep-config
+@comment $NetBSD: PLIST,v 1.2 2004/08/31 15:47:56 jmmv Exp $
bin/beep-media-player
-include/beep/beepctrl.h
-include/beep/configfile.h
-include/beep/dirbrowser.h
-include/beep/formatter.h
-include/beep/titlestring.h
-include/beep/util.h
+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
lib/bmp/Input/libcdaudio.a
lib/bmp/Input/libcdaudio.la
lib/bmp/Input/libcdaudio.so
@@ -30,12 +32,11 @@
lib/libbeep.a
lib/libbeep.la
lib/libbeep.so
-lib/libbeep.so.1
-lib/libbeep.so.1.0
-lib/pkgconfig/beep.pc
+lib/libbeep.so.2
+lib/libbeep.so.2.0
+lib/pkgconfig/bmp.pc
man/man1/beep-media-player.1
-share/aclocal/beep.m4
-share/applications/beep.desktop
+share/applications/bmp.desktop
share/bmp/Skins/Default/Avs.bmp
share/bmp/Skins/Default/Balance.bmp
share/bmp/Skins/Default/Eq_ex.bmp
@@ -56,9 +57,30 @@
share/bmp/Skins/Default/readme.txt
share/bmp/Skins/Default/screenshot.bmp
share/bmp/Skins/Default/vIscolor.txt
-share/bmp/beep.svg
-share/bmp/beep_logo.xpm
+share/bmp/glade/equalizerwin_preset_menu.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/icons/bmp.svg
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bmp.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bmp.mo
+@comment in xdg-dirs: @dirrm share/icons
+@dirrm share/bmp/images
+@dirrm share/bmp/glade
@dirrm share/bmp/Skins/Default
@dirrm share/bmp/Skins
@dirrm share/bmp
@@ -68,4 +90,3 @@
@dirrm lib/bmp/Input
@dirrm lib/bmp
@dirrm include/bmp
-@dirrm include/beep
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/distinfo
--- a/audio/bmp/distinfo Tue Aug 31 15:39:08 2004 +0000
+++ b/audio/bmp/distinfo Tue Aug 31 15:47:56 2004 +0000
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.6 2004/06/26 22:12:28 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/08/31 15:47:56 jmmv Exp $
-SHA1 (bmp-0.9.6.1.tar.gz) = c07b55c7fa3e965ff07bf7794b1ca03d00606197
-Size (bmp-0.9.6.1.tar.gz) = 1472078 bytes
-SHA1 (patch-ab) = 04eb21affbcefa34645a05b0c95bfa906202d7cf
-SHA1 (patch-ac) = 3e374fe2143a8fefcd84ff2499f97e170587ca8d
-SHA1 (patch-ad) = f51902a47efaf2423f86e5fc4c6ea7a7850b5034
-SHA1 (patch-ae) = 9461bcf2a238d44f6e0d92a465f7297c952e0182
-SHA1 (patch-ag) = 8ac4b5b1568c35c8a2d6bc9382e968c998ee04a4
-SHA1 (patch-ah) = 78a14f18656b79abd1250c659bcb4f7991396c42
-SHA1 (patch-ai) = 040adc1f20b7f283c6af1334117a26b76a293000
-SHA1 (patch-aj) = e6d354777dd4c8c5bf3b0bf08bdb1a6bfa4855dc
-SHA1 (patch-ak) = 33c0a13036271b817a82dac7c0275130dc1dcede
-SHA1 (patch-al) = 3887309232a926fa689e4d996ab4747eff38cde8
-SHA1 (patch-am) = b1b15fe6deeee7e9d51ce3cb8739baf9886e3812
+SHA1 (bmp-0.9.7rc2.tar.gz) = a2e3d72adb20e91cc3a8731314c5983c1d5303b6
+Size (bmp-0.9.7rc2.tar.gz) = 1705197 bytes
+SHA1 (patch-ag) = 5d8fc1b296c02165d1e65f3158bd38482d284ab8
SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
-SHA1 (patch-ao) = 9043ce4618715ff2cfe12df0d31806a9745c25ed
+SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
-SHA1 (patch-aq) = 37f42a5bc9eca8568f5b3889580580997c3c6fc1
-SHA1 (patch-ar) = 2d519625a427cd54fa9af376bda80c085b617ea2
+SHA1 (patch-aq) = 4ac4232954c423dcb5a444020e9a900f3b36a6df
+SHA1 (patch-ar) = cef5065b03db792d1290e74165acc34dcd655e70
+SHA1 (patch-as) = 3277fb3113fe00cecec82e1fdef91a470416c21e
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/patches/patch-ab
--- a/audio/bmp/patches/patch-ab Tue Aug 31 15:39:08 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/mpg123/fileinfo.c.orig Wed Dec 24 13:55:45 2003
-+++ Input/mpg123/fileinfo.c
-@@ -308,6 +308,11 @@ void mpg123_file_info_box(char *filename
- bool_label[1] = _("Yes");
-
- if (!window) {
-+ GtkWidget *pixmapwid, *test_table;
-+ GtkWidget *urk, *blark;
-+ GdkPixbuf *pixbuf;
-+ PangoAttrList *attrs;
-+ PangoAttribute *attr;
-
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-@@ -323,8 +328,6 @@ void mpg123_file_info_box(char *filename
- filename_vbox = gtk_hbox_new(FALSE, 5);
- gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0);
-
-- GtkWidget *pixmapwid;
-- GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
- gnome_mime_audio_xpm);
- pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
-@@ -335,8 +338,6 @@ void mpg123_file_info_box(char *filename
-
- label = gtk_label_new(NULL);
-
-- PangoAttrList *attrs;
-- PangoAttribute *attr;
-
- attrs = pango_attr_list_new();
-
-@@ -382,7 +383,7 @@ void mpg123_file_info_box(char *filename
- //// MPEG Layer Info
-
- // FIXME: Obvious...
-- GtkWidget *test_table = gtk_table_new(2, 10, FALSE);
-+ test_table = gtk_table_new(2, 10, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
- gtk_container_add(GTK_CONTAINER(mpeg_box), test_table);
-
-@@ -457,8 +458,6 @@ void mpg123_file_info_box(char *filename
- gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4,
- 5, GTK_FILL, GTK_FILL, 10, 2);
-
-- GtkWidget *urk, *blark;
--
- urk = gtk_label_new("");
- blark = gtk_label_new("");
- gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5);
-@@ -756,10 +755,12 @@ void mpg123_file_info_box(char *filename
- return;
- }
-
-+ {
- struct stat mstat;
- stat(filename, &mstat);
- gtk_widget_set_sensitive(id3_frame,
- ((mstat.st_mode & S_IWRITE) == S_IWRITE));
-+ }
- /* FIXME: Check for UID/GID too? */
-
- fill_entries(NULL, NULL);
diff -r 92f85f75cadc -r c4201085bd7d audio/bmp/patches/patch-ac
--- a/audio/bmp/patches/patch-ac Tue Aug 31 15:39:08 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/mpg123/mpg123.c.orig Wed Dec 24 13:55:45 2003
-+++ Input/mpg123/mpg123.c
-@@ -669,12 +669,13 @@ void mpg123_return_tag_value_by_name(gch
- if (!id3) {
-
-
-+ int result_read;
- int result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END);
- if (result_seek)
- return;
-
-
-- int result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
-+ result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
- if (result_read != sizeof(id3v1tag))
- return;
- if (strncmp(id3v1tag.tag, "TAG", 3) != 0)
-@@ -1111,6 +1112,7 @@ static void *decode_loop(void *arg)
-
- static void play_file(char *filename)
- {
-+ pthread_attr_t pta;
Home |
Main Index |
Thread Index |
Old Index