pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/bmp Initial import of bmp, version 0.9.6:
details: https://anonhg.NetBSD.org/pkgsrc/rev/4daf62b75fa4
branches: trunk
changeset: 472635:4daf62b75fa4
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Sun Apr 11 18:11:06 2004 +0000
description:
Initial import of bmp, version 0.9.6:
Beep Media Player is a fork of XMMS. Its primary goals are interface
and usability, all based on the technology provided by GTK2+, while
maintaining the skinned user interface.
Slightly based on the beep-media-player package found in pkgsrc-wip.
diffstat:
audio/bmp/Makefile.common | 61 +++++++++++++++++
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-af | 13 +++
audio/bmp/patches/patch-ag | 15 ++++
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 +++
13 files changed, 560 insertions(+), 0 deletions(-)
diffs (truncated from 612 to 300 lines):
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/Makefile.common Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
+#
+
+DISTNAME= bmp-0.9.6
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=beepmp/}
+
+MAINTAINER= jmmv%NetBSD.org@localhost
+HOMEPAGE= http://beepmp.sourceforge.net/
+COMMENT= Beep Media Player (fork of XMMS to work with GTK+ 2.x)
+
+DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs
+
+DISTINFO_FILE= ${.CURDIR}/../../audio/bmp/distinfo
+FILESDIR= ${.CURDIR}/../../audio/xmms/files
+PATCHDIR= ${.CURDIR}/../../audio/bmp/patches
+
+GNU_CONFIGURE= yes
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_X11= yes
+
+CONFIGURE_ARGS+= --disable-alsa
+CONFIGURE_ARGS+= --disable-esd
+CONFIGURE_ARGS+= --disable-opengl
+CONFIGURE_ARGS+= --disable-oss
+CONFIGURE_ARGS+= --disable-vorbis
+
+PKGCONFIG_OVERRIDE+= beep.pc
+
+.include "../../mk/bsd.prefs.mk"
+
+PTHREAD_OPTS+= require
+
+.if ${OPSYS} == "NetBSD"
+RAWPART!= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
+CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \
+ --with-cdda-device=/dev/rcd0${RAWPART} \
+ --with-cdda-dir=/cdrom/
+
+. if ${MACHINE_ARCH} == "i386"
+post-patch:
+. if ${OBJECT_FMT} == "a.out"
+ ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/Input/mpg123/decode_i586.s
+. endif
+ cd ${WRKSRC}/Input/mpg123 && \
+ ${MV} decode_i586.s decode_i586.s.orig && \
+ ${SED} -e 's@^/@#/@g' <decode_i586.s.orig >decode_i586.s
+. endif
+.endif
+
+.include "../../audio/libmikmod/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-ab Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,65 @@
+$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 ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-ac Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,39 @@
+$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;
+ memset(&fr, 0, sizeof(struct frame));
+ memset(&temp_fr, 0, sizeof(struct frame));
+
+@@ -1124,9 +1126,10 @@ static void play_file(char *filename)
+ output_opened = FALSE;
+ dopause = FALSE;
+
+- pthread_attr_t pta;
+ (void) pthread_attr_init(&pta);
++#if defined(_POSIX_PRIORITY_SCHEDULING)
+ (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
++#endif
+ (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);
+
+ pthread_create(&decode_thread, &pta, decode_loop, g_strdup(filename));
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-ad Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,73 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
+
+--- Input/vorbis/fileinfo.c.orig Wed Dec 24 13:57:29 2003
++++ Input/vorbis/fileinfo.c
+@@ -494,6 +494,11 @@ void vorbis_file_info_box(char *fn)
+ if (!window) {
+ GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox;
+ GtkWidget *table, *bbox, *cancel_button;
++ GtkWidget *pixmapwid, *test_table, *boxx;
++ GtkImage *img;
++ GdkPixbuf *pixbuf;
++ PangoAttrList *attrs;
++ PangoAttribute *attr;
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
+@@ -508,16 +513,13 @@ void vorbis_file_info_box(char *fn)
+ filename_hbox = gtk_hbox_new(FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
+
+- GtkWidget *pixmapwid;
+- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
++ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
+ gnome_mime_audio_ogg_xpm);
+ pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
+ gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
+ gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE,
+ 0);
+
+- PangoAttrList *attrs;
+- PangoAttribute *attr;
+
+ attrs = pango_attr_list_new();
+
+@@ -722,7 +724,6 @@ void vorbis_file_info_box(char *fn)
+ GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
+ #endif
+
+- GtkWidget *boxx;
+ boxx = gtk_hbutton_box_new();
+ gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);
+
+@@ -739,7 +740,7 @@ void vorbis_file_info_box(char *fn)
+ gtk_table_attach(table, boxx, 0, 5, 6, 7, GTK_FILL, 0, 0, 8);
+
+ rg_show_button = gtk_toggle_button_new();
+- GtkImage *img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
++ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
+ GTK_ICON_SIZE_MENU);
+ gtk_container_add(rg_show_button, img);
+ g_signal_connect(G_OBJECT(rg_show_button), "toggled",
+@@ -832,7 +833,7 @@ void vorbis_file_info_box(char *fn)
+ gtk_box_set_spacing(GTK_BOX(info_box), 0);
+
+ // 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(info_box), test_table);
+
+@@ -1073,10 +1074,12 @@ void vorbis_file_info_box(char *fn)
+ gtk_window_set_title(GTK_WINDOW(window), tmp);
+ // rg_show_cb(rg_show_button, NULL);
+
++ {
+ struct stat mstat;
+ stat(fn, &mstat);
+ gtk_widget_set_sensitive(tag_frame,
+ ((mstat.st_mode & S_IWRITE) == S_IWRITE));
++ }
+
+ g_signal_connect_swapped(title_entry, "changed", change_buttons,
+ save_button);
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-ae Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
+
+--- Input/vorbis/vorbis.c.orig Wed Dec 24 13:57:29 2003
++++ Input/vorbis/vorbis.c
+@@ -521,14 +521,16 @@ static void *vorbis_play_loop(void *arg)
+
+ static void vorbis_play(char *filename)
+ {
++ pthread_attr_t pta;
+ vorbis_playing = 1;
+ vorbis_bytes_streamed = 0;
+ vorbis_eos = 0;
+ output_error = FALSE;
+
+- pthread_attr_t pta;
+ (void) pthread_attr_init(&pta);
++#if defined(_POSIX_PRIORITY_SCHEDULING)
+ (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
++#endif
+ (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);
+
+ pthread_create(&tid, &pta, vorbis_play_loop, g_strdup(filename));
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-af Sun Apr 11 18:11:06 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
+
+--- beep/about.c.orig Wed Dec 24 17:30:09 2003
++++ beep/about.c
+@@ -249,7 +249,7 @@ void show_about_window(void)
+ if (!beep_logo_pmap)
+ beep_logo_pmap =
+ gdk_pixmap_create_from_xpm_d(about_window->window,
+- &beep_logo_mask, NULL, beep_logo);
++ &beep_logo_mask, NULL, beep_logo_xpm);
+
+ about_credits_logo_box = gtk_hbox_new(TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(about_vbox), about_credits_logo_box,
diff -r ab7af2bf8ec1 -r 4daf62b75fa4 audio/bmp/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/bmp/patches/patch-ag Sun Apr 11 18:11:06 2004 +0000
Home |
Main Index |
Thread Index |
Old Index