From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 23 18:20:12 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B28F316A4CF for ; Sun, 23 Nov 2003 18:20:12 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DBB643FA3 for ; Sun, 23 Nov 2003 18:20:09 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAO2K6FY025129 for ; Sun, 23 Nov 2003 18:20:06 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAO2K6Fn025128; Sun, 23 Nov 2003 18:20:06 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 23 Nov 2003 18:20:06 -0800 (PST) Resent-Message-Id: <200311240220.hAO2K6Fn025128@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Simon Barner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FEE416A4CE for ; Sun, 23 Nov 2003 18:15:16 -0800 (PST) Received: from mailout.informatik.tu-muenchen.de (mailout.informatik.tu-muenchen.de [131.159.0.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04BBC43FBF for ; Sun, 23 Nov 2003 18:15:13 -0800 (PST) (envelope-from barner@in.tum.de) Received: from zi025.glhnet.mhn.de (localhost.glhnet.mhn.de. [127.0.0.1]) by zi025.glhnet.mhn.de (8.12.9p2/8.12.9) with ESMTP id hAO2C5lc038685; Mon, 24 Nov 2003 03:12:05 +0100 (CET) (envelope-from simon@zi025.glhnet.mhn.de) Received: (from simon@localhost) by zi025.glhnet.mhn.de (8.12.9p2/8.12.9/Submit) id hAO2C5ea038684; Mon, 24 Nov 2003 03:12:05 +0100 (CET) (envelope-from simon) Message-Id: <200311240212.hAO2C5ea038684@zi025.glhnet.mhn.de> Date: Mon, 24 Nov 2003 03:12:05 +0100 (CET) From: Simon Barner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/59628: [non maintainer] multimedia/beep-media-player: Fix compilation on 4.x (vorbis!) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Simon Barner List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2003 02:20:12 -0000 >Number: 59628 >Category: ports >Synopsis: [non maintainer] multimedia/beep-media-player: Fix compilation on 4.x (vorbis!) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 23 18:20:03 PST 2003 >Closed-Date: >Last-Modified: >Originator: Simon Barner >Release: FreeBSD 4.9-PRERELEASE i386 >Organization: >Environment: System: FreeBSD zi025.glhnet.mhn.de 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Thu Sep 4 20:49:53 CEST 2003 simon@zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386 >Description: - Patches to fix compilation with gcc 2.95. In my last PR, I unintentionally missed the Vorbis plugin. - Fix plist - Comment out message about disabled mikmod build option >How-To-Repeat: N/A >Fix: diff -ruN beep-media-player.orig/Makefile beep-media-player/Makefile --- beep-media-player.orig/Makefile Wed Nov 19 20:01:55 2003 +++ beep-media-player/Makefile Mon Nov 24 03:05:09 2003 @@ -7,7 +7,7 @@ PORTNAME= beep-media-player PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://linux-media.net/beep/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5 @@ -94,9 +94,9 @@ pre-extract: .if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) || ${HAVE_GNOME:Mesound}!="" @${ECHO_MSG} -.if !defined(WITHOUT_MIKMOD) - @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." -.endif +#.if !defined(WITHOUT_MIKMOD) +# @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." +#.endif .if !defined(WITHOUT_VORBIS) @${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS." .endif diff -ruN beep-media-player.orig/files/patch-Input::vorbis::fileinfo.c beep-media-player/files/patch-Input::vorbis::fileinfo.c --- beep-media-player.orig/files/patch-Input::vorbis::fileinfo.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-Input::vorbis::fileinfo.c Mon Nov 24 03:03:44 2003 @@ -0,0 +1,78 @@ +--- Input/vorbis/fileinfo.c.orig Mon Nov 24 02:44:46 2003 ++++ Input/vorbis/fileinfo.c Mon Nov 24 02:48:33 2003 +@@ -498,6 +498,8 @@ + + static GtkWidget *filename_entry, *tag_frame; + ++ struct stat mstat; ++ + g_free(vte.filename); + vte.filename = g_strdup(fn); + +@@ -505,7 +507,14 @@ + { + GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox; + GtkWidget *table, *bbox, *cancel_button; +- ++ GtkWidget * pixmapwid; ++ GdkPixbuf * pixbuf; ++ PangoAttrList *attrs; ++ PangoAttribute *attr; ++ GtkWidget * boxx; ++ GtkImage * img; ++ GtkWidget * test_table; ++ + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); + g_signal_connect(G_OBJECT(window), "destroy", +@@ -519,15 +528,11 @@ + 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 **)gnome_mime_audio_ogg_xpm); ++ 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 (); + + attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD); +@@ -728,7 +733,6 @@ + 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); + +@@ -746,7 +750,7 @@ + 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, GTK_ICON_SIZE_MENU); ++ 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", + G_CALLBACK(rg_show_cb), NULL); +@@ -836,7 +840,7 @@ + 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); + +@@ -1068,7 +1072,6 @@ + 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 ) ); + diff -ruN beep-media-player.orig/files/patch-Input::vorbis::vorbis.c beep-media-player/files/patch-Input::vorbis::vorbis.c --- beep-media-player.orig/files/patch-Input::vorbis::vorbis.c Thu Jan 1 01:00:00 1970 +++ beep-media-player/files/patch-Input::vorbis::vorbis.c Mon Nov 24 03:03:44 2003 @@ -0,0 +1,19 @@ +--- Input/vorbis/vorbis.c.orig Mon Nov 24 02:43:58 2003 ++++ Input/vorbis/vorbis.c Mon Nov 24 02:44:23 2003 +@@ -134,7 +134,7 @@ + FILE *stream; + OggVorbis_File vfile; /* avoid thread interaction */ + char *ext; +- ++ gint result; + + /* is this our http resource? */ + if (strncasecmp(filename, "http://", 7) == 0) { +@@ -161,7 +161,6 @@ + memset(&vfile, 0, sizeof(vfile)); + pthread_mutex_lock(&vf_mutex); + +- gint result; + result = ov_test(stream, &vfile, NULL, 0); + + switch (result) { diff -ruN beep-media-player.orig/pkg-plist beep-media-player/pkg-plist --- beep-media-player.orig/pkg-plist Sat Nov 15 03:24:06 2003 +++ beep-media-player/pkg-plist Mon Nov 24 03:03:44 2003 @@ -13,11 +13,13 @@ lib/libbeep.so.1 lib/beep/Input/libcdaudio.so lib/beep/Input/libmpg123.so +%%VORBISPLUGIN:%%lib/beep/Input/libvorbis.so lib/beep/Output/libOSS.so %%ESDPLUGIN:%%lib/beep/Output/libesdout.so lib/beep/Visualization/libbscope.so share/aclocal/beep.m4 @dirrm lib/beep/Output @dirrm lib/beep/Input +@dirrm lib/beep/Visualization @dirrm lib/beep @dirrm include/beep >Release-Note: >Audit-Trail: >Unformatted: