mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

* Update to pre5

Browse Source 
* Fix build on -STABLE

PR:		59279
Submitted by:	Simon Barner <barner@in.tum.de>
Approved by:	maintainer
This commit is contained in:
Joe Marcus Clarke 2003-11-15 02:24:06 +00:00
parent 3d914605fa
commit 3de5f17440
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=93987
13 changed files with 490 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/beep-media-player/Makefile
View File

@ -7,16 +7,17 @@
PORTNAME= beep-media-player
PORTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://linux-media.net/beep/downloads/
DISTNAME= ${PORTNAME}-${PORTVERSION}-pre4-2
DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5
MAINTAINER= flynn@energyhq.es.eu.org
COMMENT= GTK2 mp3 player
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-pre4
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-pre5
USE_GNOME= gtk20
WANT_GNOME= yes
USE_X_PREFIX= yes
@ -33,7 +34,7 @@ MAN1= beep.1
INPUT_PLUGINS= cdaudio,mpg123
OUTPUT_PLUGINS= OSS
VISUALIZATION_PLUGINS= blur_scope,sanalyzer
VISUALIZATION_PLUGINS= blur_scope
PLIST_SUB= DATADIR="share"

2
multimedia/beep-media-player/distinfo
View File

@ -1 +1 @@
MD5 (beep-media-player-1.0.0-pre4-2.tar.gz) = dfd65e25725b0b1b37f5cba26e545c88
MD5 (beep-media-player-1.0.0-pre5.tar.gz) = 64aa256b8e34c44e84df44ff749cd412

15
multimedia/beep-media-player/files/patch-Input::cdaudio::cdaudio.c Normal file
View File

@ -0,0 +1,15 @@
--- Input/cdaudio/cdaudio.c.orig Fri Nov 14 05:38:50 2003
+++ Input/cdaudio/cdaudio.c Fri Nov 14 05:39:31 2003
@@ -695,10 +695,11 @@
struct driveinfo* cdda_find_drive(char *filename)
{
GList *node;
+ struct driveinfo *d;
// FIXME: Will always return the first drive
node = cdda_cfg.drives;
- struct driveinfo *d = node->data;
+ d = node->data;
for (node = cdda_cfg.drives; node; node = node->next)
{

71
multimedia/beep-media-player/files/patch-Input::mpg123::fileinfo.c Normal file
View File

@ -0,0 +1,71 @@
--- Input/mpg123/fileinfo.c.orig Fri Nov 14 05:40:55 2003
+++ Input/mpg123/fileinfo.c Fri Nov 14 05:44:47 2003
@@ -299,6 +299,8 @@
gint i;
gchar *title;
+ struct stat mstat;
+
emphasis[0] = _("None");
emphasis[1] = _("50/15 ms");
emphasis[2] = "";
@@ -308,6 +310,14 @@
if (!window)
{
+ GtkWidget * pixmapwid;
+ GdkPixbuf * pixbuf;
+
+ PangoAttrList *attrs;
+ PangoAttribute *attr;
+
+ GtkWidget * test_table;
+ GtkWidget *urk,*blark;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
@@ -322,8 +332,6 @@
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);
g_object_unref(pixbuf);
@@ -332,9 +340,6 @@
label = gtk_label_new(NULL);
- PangoAttrList *attrs;
- PangoAttribute *attr;
-
attrs = pango_attr_list_new ();
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
@@ -377,7 +382,7 @@
//// 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);
@@ -437,8 +442,6 @@
gtk_label_set_justify(GTK_LABEL(mpeg_filesize_val), GTK_JUSTIFY_LEFT );
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);
@@ -683,7 +686,6 @@
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? */

16
multimedia/beep-media-player/files/patch-beep::main.c Normal file
View File

@ -0,0 +1,16 @@
--- beep/main.c.orig Fri Nov 14 05:29:27 2003
+++ beep/main.c Fri Nov 14 05:30:06 2003
@@ -2030,11 +2030,12 @@
if (!strncasecmp(path,"fonts:///",9)) {
+ gchar * decoded;
path[strlen(path)-2] = 0; /* Why the hell a CR&LF? */
path = path + 8;
/* plain, since we already stripped the first URI part */
- gchar * decoded = xmms_urldecode_plain(path);
+ decoded = xmms_urldecode_plain(path);
decoded++;
/* Get the old font's size, and add it to the dropped font's name */

20
multimedia/beep-media-player/files/patch-beep::output.c Normal file
View File

@ -0,0 +1,20 @@
--- beep/output.c.orig Fri Nov 14 05:21:23 2003
+++ beep/output.c Fri Nov 14 05:21:52 2003
@@ -31,14 +31,15 @@
{
gint time;
gint pos;
-
+ gboolean playing;
+
GList *node = g_list_nth(op_data->output_list, i);
if (node)
op_data->current_output_plugin = node->data;
else
op_data->current_output_plugin = NULL;
- gboolean playing = get_input_playing();
+ playing = get_input_playing();
if (playing) {
/* FIXME: we do all on our own here */

149
multimedia/beep-media-player/files/patch-beep::playlist.c Normal file
View File

@ -0,0 +1,149 @@
--- beep/playlist.c.orig Fri Nov 14 06:25:26 2003
+++ beep/playlist.c Fri Nov 14 06:34:23 2003
@@ -607,6 +607,7 @@
while (*string)
{
+ GList *node;
temp = strchr(string, '\n');
if (temp)
{
@@ -633,7 +634,6 @@
}
}
- GList *node;
node = g_list_nth(get_playlist(), pos);
entries += i;
@@ -2346,6 +2346,7 @@
guint64 node_idx;
gchar * from_real;
gboolean error;
+ db_node * node;
/* It's not really a waste creating both beforehand since we will certainly need the folder one at least once,
and most probably the audio one too anyway */
@@ -2366,7 +2367,6 @@
current = gtk_tree_model_get_path(model, &parent_iter);
node_idx = dirbrowser_get_nodeidx_from_iter(model, &parent_iter, 0, &error);
- db_node * node;
node = g_ptr_array_index(nodes, node_idx);
from_real = g_strconcat(node->path_real,"/",from,NULL);
@@ -2388,10 +2388,11 @@
{
while ((dirent = readdir(dir)) != NULL)
{
+ char * name_real;
// FIXME: Excludes hidden dirs too (do we want them anyway?)
if (dirent->d_name[0] == '.')
continue;
- char * name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL));
+ name_real = g_strdup(g_strconcat(from_real,"/",dirent->d_name,NULL));
stat(name_real, &statbuf);
if ( S_ISDIR(statbuf.st_mode) ) {
@@ -2513,9 +2514,10 @@
char *buffer, **lines, **frags;
struct stat stats;
guint i;
-
+ GdkPixbuf * buf;
+
model = gtk_tree_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
harddisk_pixbuf,
TRUE,
NULL);
@@ -2803,13 +2805,16 @@
PangoAttrList *attrs;
PangoAttribute *attr;
+
+ GdkPixbuf * buf;
+
attrs = pango_attr_list_new ();
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
attr->start_index = 0;
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
- GdkPixbuf * buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
+ buf = gdk_pixbuf_new_from_inline(sizeof(harddisk_pixbuf),
harddisk_pixbuf,
TRUE,
NULL);
@@ -2863,9 +2868,10 @@
if ( S_ISDIR(statbuf.st_mode) ) {
db_node * node;
- node = g_malloc0(sizeof(db_node));
char * dir = g_strdup(path_real);
char * name = g_strdup(path_real);
+
+ node = g_malloc0(sizeof(db_node));
node->path_real = dir;
gtk_label_set_text(variable, g_strdup(g_strconcat("Choose a Name for:\n",name,NULL)));
@@ -2932,9 +2938,9 @@
(model,
&iter,
gtk_tree_path_to_string(paths->data))) {
+ db_node * node;
gtk_tree_store_remove (GTK_TREE_STORE(model), &iter);
- db_node * node;
node = g_ptr_array_index(nodes, node_idx);
g_ptr_array_remove_index(nodes, node_idx);
ctr_array--;
@@ -3178,7 +3184,11 @@
/* create window, etc */
/* yes this is all messed up */
-
+ GSList * group;
+ GtkWidget * hbox_default_setting;
+ PangoAttrList *attrs;
+ PangoAttribute *attr;
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "beep :: directory browser");
gtk_container_set_border_width(GTK_CONTAINER(window),
@@ -3195,8 +3205,6 @@
vbox = gtk_vbox_new (FALSE, 0);
- PangoAttrList *attrs;
- PangoAttribute *attr;
attrs = pango_attr_list_new ();
attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
attr->start_index = 0;
@@ -3235,8 +3243,6 @@
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, 0);
- GSList * group;
-
rb_enq = gtk_radio_button_new(NULL);
group = gtk_radio_button_get_group(rb_enq);
rb_play = gtk_radio_button_new(group);
@@ -3257,7 +3263,6 @@
gtk_misc_set_alignment(GTK_MISC(label_rb), 0.0, 0.0);
- gtk_label_set_attributes (GTK_LABEL(label_rb), attrs);
gtk_container_add(GTK_CONTAINER (frame),vbox);
gtk_box_pack_start(GTK_BOX (vbox_main), frame,TRUE,TRUE,0);
@@ -3287,7 +3292,7 @@
hbox_lower = gtk_hbox_new(FALSE, 8);
- GtkWidget * hbox_default_setting = gtk_hbox_new(FALSE,8);
+ hbox_default_setting = gtk_hbox_new(FALSE,8);
gtk_box_pack_start(GTK_BOX(hbox_default_setting), table_rb,FALSE,FALSE,0);
gtk_box_pack_start(GTK_BOX(hbox_default_setting), gtk_vseparator_new(), FALSE,FALSE,0);

47
multimedia/beep-media-player/files/patch-beep::playlist_list.c Normal file
View File

@ -0,0 +1,47 @@
--- beep/playlist_list.c.orig Fri Nov 14 05:24:54 2003
+++ beep/playlist_list.c Fri Nov 14 05:28:24 2003
@@ -292,6 +292,8 @@
int len;
int pix_len;
char *tmp;
+ guint padding, plist_length_int;
+ PangoLayout * layout;
if (cfg.convert_underscore)
while ((tmp = strchr(text, '_')) != NULL)
@@ -318,9 +320,6 @@
pix_len = (width_approx_letters * len);
}
-
- guint padding, plist_length_int;
- PangoLayout * layout;
if (cfg.show_numbers_in_pl) {
@@ -442,12 +441,13 @@
{
int x, y;
gchar * tail;
-
+ guint t_width;
+ guint len_tail;
+ guint len;
+
tail = g_strdup_printf("%s%s",qstr,length);
if (strlen(tail) > max_time_len) max_time_len = strlen(tail);
- guint t_width;
- guint len_tail;
/* FIXME: This is just an approximate alignment, maybe
something still fast, but exact could be done */
@@ -485,7 +485,7 @@
else
gdk_gc_set_foreground(gc, get_skin_color(SKIN_PLEDIT_NORMAL));
- guint len = strlen(tail);
+ len = strlen(tail);
layout = gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),tail);
pango_layout_set_font_description (layout, playlist_list_font);

43
multimedia/beep-media-player/files/patch-beep::prefswin.c Normal file
View File

@ -0,0 +1,43 @@
--- beep/prefswin.c.orig Fri Nov 14 05:33:05 2003
+++ beep/prefswin.c Fri Nov 14 05:36:04 2003
@@ -752,11 +752,15 @@
GtkObject *options_mouse_adj;
GtkWidget *prefswin_title_desc, *prefswin_title_label, *opt;
+ GtkWidget *table_rb;
+ GtkWidget *label;
+
char *titles[1];
PangoAttrList *attrs;
PangoAttribute *attr;
+ PangoFontDescription * playlist_list_font;
prefswin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_position(GTK_WINDOW(prefswin),GTK_WIN_POS_CENTER);
@@ -1019,7 +1023,6 @@
gtk_container_add(GTK_CONTAINER(prefswin_options_frame), options_table);
gtk_container_border_width(GTK_CONTAINER(options_table), 5);
- GtkWidget * table_rb;
table_rb = gtk_table_new(4,4,FALSE);
options_gi_box = gtk_hbox_new(FALSE, 3);
@@ -1110,7 +1113,6 @@
prefswin_fonts_vbox = gtk_table_new(4,4,TRUE);
// This ain't exactly GnomeFontPicker, but we're not a GNOME app so no GNOME widgets for us
- GtkWidget *label;
label = gtk_label_new("Playlist Font:");
attrs = pango_attr_list_new ();
@@ -1126,7 +1128,7 @@
prefswin_options_font_browse = gtk_button_new();
label_font = gtk_label_new(cfg.playlist_font);
- PangoFontDescription * playlist_list_font = pango_font_description_from_string (cfg.playlist_font);
+ playlist_list_font = pango_font_description_from_string (cfg.playlist_font);
gtk_widget_modify_font(label_font, playlist_list_font);
gtk_container_add(GTK_CONTAINER(prefswin_options_font_browse), label_font);

42
multimedia/beep-media-player/files/patch-beep::skinwin.c Normal file
View File

@ -0,0 +1,42 @@
--- beep/skinwin.c.orig Fri Nov 14 05:30:38 2003
+++ beep/skinwin.c Fri Nov 14 05:32:30 2003
@@ -190,6 +190,10 @@
GtkTreeView * treeview = GTK_TREE_VIEW(data);
GtkListStore * model;
GtkTreeSelection * l_selection;
+ guint max;
+ guint loop;
+ char * comp;
+
/* FIXME:
* This is all alittle of bad mojo here, the gtk-doc says about the "changed" signal for GtkTreeSelection:
@@ -202,10 +206,6 @@
if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(l_selection),&model,&iter)) return;
gtk_tree_model_get (GTK_TREE_MODEL(model), &iter, 1, &name, -1);
- guint max;
- guint loop;
- char * comp;
-
max = g_list_length(skinlist);
for (loop = 0; loop < max; loop++) {
@@ -423,6 +423,8 @@
GtkListStore *store;
GtkTreeModel *model;
+ GtkWidget *selection;
+
skinwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_usize(skinwin,500,380);
gtk_window_set_position(GTK_WINDOW(skinwin),GTK_WIN_POS_CENTER);
@@ -493,7 +495,7 @@
gtk_tree_view_column_set_spacing(column, 16);
gtk_tree_view_column_set_attributes (column, renderer, "text", 1, NULL);
- GtkWidget *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(change_skin_event), treeview);
g_signal_connect(G_OBJECT(skinwin), "key_press_event", G_CALLBACK(skinwin_keypress_cb), NULL);
g_signal_connect(G_OBJECT(skinwin), "show",G_CALLBACK(update_skins),treeview);

75
multimedia/beep-media-player/files/patch-beep::util.c Normal file
View File

@ -0,0 +1,75 @@
--- beep/util.c.orig Fri Nov 14 05:06:54 2003
+++ beep/util.c Fri Nov 14 05:21:01 2003
@@ -707,9 +707,11 @@
static void filebrowser_add_files(gchar** files, GtkFileSelection * filesel)
{
+ int ctr = 0;
+ char * ptr;
+
if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,FALSE);
- int ctr = 0;
while(files[ctr] != NULL) {
playlist_add(files[ctr++]);
}
@@ -717,7 +719,6 @@
if (GTK_IS_WIDGET(mainwin_jtf)) gtk_widget_set_sensitive(mainwin_jtf,TRUE);
- char * ptr;
gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child), &ptr);
/* This will give an extra slash if the current dir is the root. */
@@ -726,19 +727,23 @@
static void filebrowser_ok(GtkWidget * w, GtkWidget * filesel)
{
+ gchar** files;
+
if (util_filebrowser_is_dir(GTK_FILE_SELECTION(filesel)))
return;
- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
filebrowser_add_files(files,GTK_FILE_SELECTION(filesel));
gtk_widget_destroy(filesel);
}
static void filebrowser_play(GtkWidget * w, GtkWidget * filesel)
{
+ gchar** files;
+
if (util_filebrowser_is_dir(GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel))))
return;
playlist_clear();
- gchar** files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
+ files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
filebrowser_add_files(files,GTK_FILE_SELECTION(filesel));
gtk_widget_destroy(filesel);
playlist_play();
@@ -746,8 +751,10 @@
static void filebrowser_add_selected_files(GtkWidget * w, gpointer data)
{
+ gchar** files;
+
GtkFileSelection *filesel = GTK_FILE_SELECTION(data);
- gchar** files = gtk_file_selection_get_selections(filesel);
+ files = gtk_file_selection_get_selections(filesel);
filebrowser_add_files(files,filesel);
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
@@ -758,10 +765,12 @@
static void filebrowser_add_all_files(GtkWidget * w, gpointer data)
{
+ gchar** files;
GtkFileSelection * filesel;
+
filesel = data;
gtk_tree_selection_select_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
- gchar** files = gtk_file_selection_get_selections(filesel);
+ files = gtk_file_selection_get_selections(filesel);
filebrowser_add_files(files,filesel);
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(filesel->file_list)));
gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");

12
multimedia/beep-media-player/files/patch-ltmain.sh
View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Thu May 22 16:42:22 2003
+++ ltmain.sh Tue May 27 12:12:52 2003
@@ -1072,7 +1072,7 @@
--- ltmain.sh.orig Fri Nov 14 05:04:28 2003
+++ ltmain.sh Fri Nov 14 05:04:28 2003
@@ -1075,7 +1075,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
@ -9,7 +9,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1082,8 +1082,16 @@
@@ -1085,8 +1085,16 @@
continue
;;
@ -26,7 +26,7 @@
continue
;;
@@ -2498,6 +2506,9 @@
@@ -2506,6 +2514,9 @@
*-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
;;
@ -36,7 +36,7 @@
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4325,10 +4336,12 @@
@@ -4333,10 +4344,12 @@
fi
# Install the pseudo-library for information purposes.

1
multimedia/beep-media-player/pkg-plist
View File

@ -15,6 +15,7 @@ lib/beep/Input/libcdaudio.so
lib/beep/Input/libmpg123.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