FreeBSD Bugzilla – Attachment 46067 Details for
Bug 70825
[Maintainer Update] multimedia/beep-media-player to 0.9.7rc1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
beep-media-player.diff
beep-media-player.diff (text/plain), 21.83 KB, created by
Miguel Mendez
on 2004-08-22 17:50:26 UTC
(
hide
)
Description:
beep-media-player.diff
Filename:
MIME Type:
Creator:
Miguel Mendez
Created:
2004-08-22 17:50:26 UTC
Size:
21.83 KB
patch
obsolete
>diff -ruN beep-media-player.old/Makefile beep-media-player/Makefile >--- beep-media-player.old/Makefile Sat Jul 31 23:54:29 2004 >+++ beep-media-player/Makefile Sun Aug 22 17:51:10 2004 >@@ -6,23 +6,23 @@ > # > > PORTNAME= beep-media-player >-PORTVERSION= 0.9.6.1 >-PORTREVISION= 2 >+PORTVERSION= 0.9.7 >+PORTREVISION= 1 > PORTEPOCH= 1 > CATEGORIES= multimedia audio > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= beepmp >-DISTNAME= bmp-${PORTVERSION} >+DISTNAME= bmp-${PORTVERSION}rc${PORTREVISION} > > MAINTAINER= flynn@energyhq.es.eu.org > COMMENT= GTK2 mp3 player > >-USE_GNOME= gtk20 >+USE_GNOME= gtk20 libglade2 > WANT_GNOME= yes > USE_X_PREFIX= yes > USE_REINPLACE= yes > USE_LIBTOOL_VER=15 >-LIBTOOLFILES= configure libbeep/configure >+LIBTOOLFILES= configure > USE_GMAKE= yes > INSTALLS_SHLIB= yes > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ >diff -ruN beep-media-player.old/distinfo beep-media-player/distinfo >--- beep-media-player.old/distinfo Sun Feb 8 09:08:09 2004 >+++ beep-media-player/distinfo Sun Aug 22 16:50:50 2004 >@@ -1,2 +1,2 @@ >-MD5 (bmp-0.9.6.1.tar.gz) = 0102233416eb8efaec775c415f5308eb >-SIZE (bmp-0.9.6.1.tar.gz) = 1472078 >+MD5 (bmp-0.9.7rc1.tar.gz) = e50c82c4bcb76e93ac183414d01b3591 >+SIZE (bmp-0.9.7rc1.tar.gz) = 1674199 >diff -ruN beep-media-player.old/files/patch-Input::mpg123::fileinfo.c beep-media-player/files/patch-Input::mpg123::fileinfo.c >--- beep-media-player.old/files/patch-Input::mpg123::fileinfo.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-Input::mpg123::fileinfo.c Thu Jan 1 01:00:00 1970 >@@ -1,61 +0,0 @@ >---- Input/mpg123/fileinfo.c.orig Sat Feb 7 18:24:23 2004 >-+++ Input/mpg123/fileinfo.c Sat Feb 7 18:34:26 2004 >-@@ -299,6 +299,13 @@ >- { >- gint i; >- gchar *title; >-+ GtkWidget *pixmapwid; >-+ GdkPixbuf *pixbuf; >-+ PangoAttribute *attr; >-+ PangoAttrList *attrs; >-+ GtkWidget *test_table; >-+ GtkWidget *urk, *blark; >-+ struct stat mstat; >- >- emphasis[0] = _("None"); >- emphasis[1] = _("50/15 ms"); >-@@ -323,8 +330,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); >-@@ -335,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); >-@@ -382,7 +384,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); >- >-@@ -457,8 +459,6 @@ >- 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,7 +756,6 @@ >- return; >- } >- >-- struct stat mstat; >- stat(filename, &mstat); >- gtk_widget_set_sensitive(id3_frame, >- ((mstat.st_mode & S_IWRITE) == S_IWRITE)); >diff -ruN beep-media-player.old/files/patch-Input::mpg123::mpg123.c beep-media-player/files/patch-Input::mpg123::mpg123.c >--- beep-media-player.old/files/patch-Input::mpg123::mpg123.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-Input::mpg123::mpg123.c Thu Jan 1 01:00:00 1970 >@@ -1,42 +0,0 @@ >---- Input/mpg123/mpg123.c.orig Sat Feb 7 18:21:05 2004 >-+++ Input/mpg123/mpg123.c Sat Feb 7 18:23:32 2004 >-@@ -635,6 +635,7 @@ >- gchar ** genre, guint * tracknum) >- { >- FILE *file; >-+ int result_seek, result_read; >- struct id3v1tag_t id3v1tag; >- struct id3tag_t id3tag; >- >-@@ -669,12 +670,12 @@ >- if (!id3) { >- >- >-- int result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END); >-+ 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,8 @@ >- >- static void play_file(char *filename) >- { >-+ pthread_attr_t pta; >-+ >- memset(&fr, 0, sizeof(struct frame)); >- memset(&temp_fr, 0, sizeof(struct frame)); >- >-@@ -1124,7 +1127,6 @@ >- output_opened = FALSE; >- dopause = FALSE; >- >-- pthread_attr_t pta; >- (void) pthread_attr_init(&pta); >- (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED); >- (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM); >diff -ruN beep-media-player.old/files/patch-Input::vorbis::fileinfo.c beep-media-player/files/patch-Input::vorbis::fileinfo.c >--- beep-media-player.old/files/patch-Input::vorbis::fileinfo.c Sat Jul 31 23:06:53 2004 >+++ beep-media-player/files/patch-Input::vorbis::fileinfo.c Thu Jan 1 01:00:00 1970 >@@ -1,88 +0,0 @@ >---- Input/vorbis/fileinfo.c.orig Sat Jul 31 22:46:58 2004 >-+++ Input/vorbis/fileinfo.c Sat Jul 31 22:52:22 2004 >-@@ -200,7 +200,7 @@ >- gchar *errorstring; >- errorstring = g_strdup_printf(_("An error occured:\n%s"), error); >- >-- xmms_show_message_test(_("Error!"), >-+ xmms_show_message(_("Error!"), >- errorstring, _("Ok"), FALSE, NULL, NULL); >- >- g_free(errorstring); >-@@ -488,12 +488,21 @@ >- >- static GtkWidget *filename_entry, *tag_frame; >- >-+ 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; >-+ struct stat mstat; >-+ >- g_free(vte.filename); >- vte.filename = g_strdup(fn); >- >- if (!window) { >-- GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox; >-- GtkWidget *table, *bbox, *cancel_button; >- >- window = gtk_window_new(GTK_WINDOW_TOPLEVEL); >- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); >-@@ -508,17 +517,13 @@ >- 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(); >- >- attr = pango_attr_weight_new(PANGO_WEIGHT_BOLD); >-@@ -722,7 +727,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); >- >-@@ -739,7 +743,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, >-+ 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 +836,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); >- >-@@ -1073,7 +1077,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.old/files/patch-Input::vorbis::vorbis.c beep-media-player/files/patch-Input::vorbis::vorbis.c >--- beep-media-player.old/files/patch-Input::vorbis::vorbis.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-Input::vorbis::vorbis.c Thu Jan 1 01:00:00 1970 >@@ -1,16 +0,0 @@ >---- Input/vorbis/vorbis.c.orig Sat Feb 7 19:26:13 2004 >-+++ Input/vorbis/vorbis.c Sat Feb 7 19:32:10 2004 >-@@ -521,12 +521,12 @@ >- >- 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); >- (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED); >- (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM); >diff -ruN beep-media-player.old/files/patch-beep::dirbrowser.c beep-media-player/files/patch-beep::dirbrowser.c >--- beep-media-player.old/files/patch-beep::dirbrowser.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::dirbrowser.c Thu Jan 1 01:00:00 1970 >@@ -1,177 +0,0 @@ >---- beep/dirbrowser.c.orig Sat Feb 7 18:04:24 2004 >-+++ beep/dirbrowser.c Sat Feb 7 18:18:23 2004 >-@@ -263,15 +263,17 @@ >- static gchar *bmp_db_sanify_tag(gchar * value) >- { >- >-- if (!value) >-- return "(unknown)"; >-- >-+ GString *chunk; >- gchar *frag = NULL; >- gchar **branches; >- guint ctr = 0; >- gboolean bracket_open = FALSE; >- >-- GString *chunk = g_string_new(NULL); >-+ if (!value) >-+ return "(unknown)"; >-+ >-+ >-+ chunk = g_string_new(NULL); >- branches = g_strsplit(g_strstrip(value), " ", 0); >- >- while (frag || (ctr == 0)) { >-@@ -346,6 +348,7 @@ >- GList *list = NULL; >- gboolean first = TRUE; >- gchar *from_real; >-+ GdkPixbuf *buf_dir, *buf_file, *buf_cda; >- >- from = g_locale_from_utf8(from, -1, NULL, NULL, NULL); >- from_real = bmp_db_get_path_real(from, model, &parent_iter); >-@@ -353,18 +356,19 @@ >- >- /* 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 */ >-- GdkPixbuf *buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf), >-+ * the audio one too anyway. >-+ */ >-+ buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf), >- folder_pixbuf, >- TRUE, >- NULL); >- >-- GdkPixbuf *buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf), >-+ buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf), >- audio_pixbuf, >- TRUE, >- NULL); >- >-- GdkPixbuf *buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf), >-+ buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf), >- cda_pixbuf, >- TRUE, >- NULL); >-@@ -654,6 +658,7 @@ >- >- GtkTreeModel *model; >- GtkTreeView *treeview; >-+ GtkWidget *store; >- >- treeview = gtk_tree_selection_get_tree_view(sel); >- model = gtk_tree_view_get_model(treeview); >-@@ -681,7 +686,7 @@ >- paths = paths->next; >- } >- >-- GtkWidget *store = >-+ store = >- GTK_WIDGET(bmp_db_return_filestore_model_fresh(paths_f)); >- >- gtk_tree_view_set_model(user_data, GTK_TREE_MODEL(store)); >-@@ -706,6 +711,7 @@ >- >- struct stat statbuf; >- GtkTreeModel *model; >-+ gboolean valid; >- >- model = gtk_tree_view_get_model(treeview); >- paths = bmp_db_get_paths_from_selection(treeview); >-@@ -735,7 +741,7 @@ >- if (gtk_tree_model_iter_children(model, &iter_child, &iter)) { >- if (click_play) >- playlist_clear(); >-- gboolean valid = TRUE; >-+ valid = TRUE; >- while (valid) { >- gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_child, >- FILENAME_COL, &node_name, -1); >-@@ -1308,12 +1314,15 @@ >- { >- >- GtkTreeStore *file_store; >-- >-+ GtkTreeModel *sort_model; >-+ gdouble length_pl, frac; >-+ int ctr=0; >-+ GList *files; >- >- file_store = >- gtk_tree_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, >- G_TYPE_STRING, G_TYPE_INT); >-- GtkTreeModel *sort_model = >-+ sort_model = >- gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(file_store)); >- >- >-@@ -1321,17 +1330,16 @@ >- bmp_db_mdb_sort_func, NULL, NULL); >- >- >-- gdouble length_pl = g_list_length(paths); >-+ length_pl = g_list_length(paths); >- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), 0.0); >- >-- int ctr = 0; >- >- while (paths) { >- >- gchar *path = paths->data; >- ctr++; >- >-- GList *files = bmp_db_return_files_from_path(path); >-+ files = bmp_db_return_files_from_path(path); >- >- while (files) { >- gchar *title; >-@@ -1356,7 +1364,7 @@ >- files = files->next; >- } >- >-- gdouble frac = 1 / length_pl; >-+ frac = 1 / length_pl; >- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), >- frac * ctr); >- while (gtk_events_pending()) { >-@@ -1411,15 +1419,17 @@ >- GtkWidget *treeview = NULL; >- GtkWidget *label_header; >- GtkWidget *paned; >-+ GtkWidget *fstore; >-+ GList *paths = NULL; >-+ PangoAttrList *attrs; >-+ PangoAttribute *attr; >-+ GtkTreeSelection *sel; >- >- if (!window) { >- >- /* create window, etc */ >- /* yes this is all messed up */ >- >-- PangoAttrList *attrs; >-- PangoAttribute *attr; >-- >- window = gtk_window_new(GTK_WINDOW_TOPLEVEL); >- gtk_window_set_title(GTK_WINDOW(window), "bmp :: Add Files..."); >- gtk_container_set_border_width(GTK_CONTAINER(window), 8); >-@@ -1489,17 +1499,15 @@ >- G_CALLBACK(bmp_db_keypress), window); >- >- gtk_container_add(GTK_CONTAINER(sw), treeview); >-- GtkWidget *fstore; >- >- /* FIXME: clean up variables, move them to start */ >- >- /* FIXME: paths is not freed, and is resetted every iteration */ >-- GList *paths = NULL; >- paths = g_list_append(paths, g_strdup(g_get_home_dir())); >- fstore = bmp_db_return_filestore_fresh(paths); >- gtk_container_add(GTK_CONTAINER(sw_right), fstore); >- >-- GtkTreeSelection *sel = >-+ sel = >- gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); >- g_signal_connect(G_OBJECT(sel), "changed", >- G_CALLBACK(bmp_db_row_activated), fstore); >diff -ruN beep-media-player.old/files/patch-beep::playlist_list.c beep-media-player/files/patch-beep::playlist_list.c >--- beep-media-player.old/files/patch-beep::playlist_list.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::playlist_list.c Thu Jan 1 01:00:00 1970 >@@ -1,19 +0,0 @@ >---- beep/playlist_list.c.orig Sat Feb 7 17:53:46 2004 >-+++ beep/playlist_list.c Sat Feb 7 17:54:59 2004 >-@@ -372,6 +372,7 @@ >- gint i, tw, max_first; >- guint padding; >- guint max_time_len = 0; >-+ gchar **frags; >- >- gc = pl->pl_widget.gc; >- width = pl->pl_widget.width; >-@@ -507,7 +508,7 @@ >- >- >- >-- gchar **frags = g_strsplit(tail, ":", 0); >-+ frags = g_strsplit(tail, ":", 0); >- >- layout = >- gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin), >diff -ruN beep-media-player.old/files/patch-beep::pluginenum.c beep-media-player/files/patch-beep::pluginenum.c >--- beep-media-player.old/files/patch-beep::pluginenum.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::pluginenum.c Thu Jan 1 01:00:00 1970 >@@ -1,18 +0,0 @@ >---- beep/pluginenum.c.orig Wed Dec 24 15:03:17 2003 >-+++ beep/pluginenum.c Sat Feb 7 22:08:41 2004 >-@@ -238,6 +238,7 @@ >- >- >- #ifndef DISABLE_USER_PLUGIN_DIR >-+if(0) { >- dir = g_build_filename(g_get_home_dir(), BMP_RCPATH, "plugins"); >- bmp_scan_plugins(dir); >- g_free(dir); >-@@ -259,6 +260,7 @@ >- g_free(dir); >- } >- dirsel = 0; >-+} >- #endif >- >- while (plugin_dir_list[dirsel]) { >diff -ruN beep-media-player.old/files/patch-beep::skin.c beep-media-player/files/patch-beep::skin.c >--- beep-media-player.old/files/patch-beep::skin.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::skin.c Thu Jan 1 01:00:00 1970 >@@ -1,42 +0,0 @@ >---- beep/skin.c.orig Sat Feb 7 17:42:34 2004 >-+++ beep/skin.c Sat Feb 7 17:46:18 2004 >-@@ -168,6 +168,7 @@ >- const SMID_Mapping *sm_inf; >- GdkPixmap *gpm; >- gboolean retval = FALSE; >-+ SkinPixmap *pm; >- >- if (id >= SKIN_PMID_LAST) { >- g_warning("skin pixmap id out of range (%u).", id); >-@@ -201,7 +202,7 @@ >- } >- g_free(tmpstr); >- >-- SkinPixmap *pm = &sk->pixmaps[id]; >-+ pm = &sk->pixmaps[id]; >- gpm = read_bmp(filename); >- >- if (!gpm) { >-@@ -733,9 +734,9 @@ >- GdkBitmap *skin_get_mask(MaskIndex mi, gboolean doublesize, >- gboolean shaded) >- { >-+ GdkBitmap **masks; >- g_assert(skin != NULL); >- >-- GdkBitmap **masks; >- >- g_assert(mi < SKIN_MID_LAST); >- masks = (doublesize ? skin->ds_masks : skin->masks); >-@@ -813,8 +814,10 @@ >- gint i; >- GdkPixmap *pixmap; >- GdkImage *img; >-+ SkinPixmap *eqmainpm; >-+ >- g_assert(skin != NULL); >-- SkinPixmap *eqmainpm = &skin->pixmaps[SKIN_EQMAIN]; >-+ eqmainpm = &skin->pixmaps[SKIN_EQMAIN]; >- if (eqmainpm->pixmap != NULL && >- eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313) >- pixmap = eqmainpm->pixmap; >diff -ruN beep-media-player.old/files/patch-beep::skinwin.c beep-media-player/files/patch-beep::skinwin.c >--- beep-media-player.old/files/patch-beep::skinwin.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::skinwin.c Thu Jan 1 01:00:00 1970 >@@ -1,18 +0,0 @@ >---- beep/skinwin.c.orig Sat Feb 7 18:16:37 2004 >-+++ beep/skinwin.c Sat Feb 7 18:17:50 2004 >-@@ -216,11 +216,12 @@ >- int i; >- char *str, *skinsdir; >- gchar **list; >-+ GtkTreeView *treeview; >-+ GtkTreeSelection *selection = NULL; >-+ GtkListStore *store; >- >- gtk_widget_set_sensitive(scrolled_win, FALSE); >-- GtkTreeView *treeview = GTK_TREE_VIEW(data); >-- GtkTreeSelection *selection = NULL; >-- GtkListStore *store; >-+ treeview = GTK_TREE_VIEW(data); >- >- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); >- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview)); >diff -ruN beep-media-player.old/files/patch-beep::softvolume.c beep-media-player/files/patch-beep::softvolume.c >--- beep-media-player.old/files/patch-beep::softvolume.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::softvolume.c Thu Jan 1 01:00:00 1970 >@@ -1,16 +0,0 @@ >---- beep/softvolume.c.orig Sat Feb 7 18:18:57 2004 >-+++ beep/softvolume.c Sat Feb 7 18:20:03 2004 >-@@ -27,11 +27,12 @@ >- void soft_volume_load(char *section, SoftVolumeConfig * c) >- { >- ConfigFile *cfgfile; >-+ char *sec; >- >- if (c == NULL) >- return; >- >-- char *sec = (section == NULL ? "xmms" : section); >-+ sec = (section == NULL ? "xmms" : section); >- >- c->enabled = FALSE; >- c->volume_left = 0; >diff -ruN beep-media-player.old/files/patch-beep::textbox.c beep-media-player/files/patch-beep::textbox.c >--- beep-media-player.old/files/patch-beep::textbox.c Sun Feb 8 09:08:09 2004 >+++ beep-media-player/files/patch-beep::textbox.c Thu Jan 1 01:00:00 1970 >@@ -1,15 +0,0 @@ >---- beep/textbox.c.orig Sat Feb 7 17:49:22 2004 >-+++ beep/textbox.c Sat Feb 7 17:49:58 2004 >-@@ -142,9 +142,9 @@ >- >- void textbox_set_text(TextBox * tb, gchar * text) >- { >-- >-- lock_widget(tb); >-- gchar *utf8text; >-+ gchar *utf8text; >-+ >-+ lock_widget(tb); >- if (tb->tb_text) { >- if (!strcmp(text, tb->tb_text)) { >- unlock_widget(tb); >diff -ruN beep-media-player.old/pkg-message beep-media-player/pkg-message >--- beep-media-player.old/pkg-message Thu Nov 13 20:54:51 2003 >+++ beep-media-player/pkg-message Sun Aug 22 18:26:10 2004 >@@ -1,2 +1,14 @@ > beep supports Gzipped and uncompressed skins. If you would like to use > Zip format skins you will need to ensure archivers/unzip is installed. >+ >+FreeBSD 5.x users should add the following to their /etc/libmap.conf >+ >+# Might crash if used with libpthread >+[beep-media-player] >+libc_r.so.5 libc_r.so.5 >+libc_r.so libc_r.so >+ >+[/usr/X11R6/bin/beep-media-player] >+libc_r.so.5 libc_r.so.5 >+libc_r.so libc_r.so >+ >diff -ruN beep-media-player.old/pkg-plist beep-media-player/pkg-plist >--- beep-media-player.old/pkg-plist Sat Jul 31 23:54:29 2004 >+++ beep-media-player/pkg-plist Sun Aug 22 17:50:04 2004 >@@ -1,24 +1,26 @@ >-bin/beep-config > bin/beep-media-player >-include/beep/beepctrl.h >-include/beep/configfile.h >-include/beep/dirbrowser.h >-include/beep/formatter.h >+include/bmp/beepctrl.h >+include/bmp/configfile.h >+include/bmp/dirbrowser.h >+include/bmp/formatter.h > include/bmp/fullscreen.h > include/bmp/plugin.h >-include/beep/titlestring.h >-include/beep/util.h >+include/bmp/titlestring.h >+include/bmp/util.h >+include/bmp/vfs.h >+include/bmp/rcfile.h >+include/bmp/configdb.h > lib/libbeep.a > lib/libbeep.so >-lib/libbeep.so.1 >+lib/libbeep.so.2 > lib/bmp/Input/libcdaudio.so > lib/bmp/Input/libmpg123.so > %%VORBISPLUGIN:%%lib/bmp/Input/libvorbis.so > lib/bmp/Output/libOSS.so > %%ESDPLUGIN:%%lib/bmp/Output/libesdout.so > lib/bmp/Visualization/libbscope.so >-libdata/pkgconfig/beep.pc >-share/aclocal/beep.m4 >+libdata/pkgconfig/bmp.pc >+share/applications/bmp.desktop > share/bmp/Skins/Default/Avs.bmp > share/bmp/Skins/Default/Balance.bmp > share/bmp/Skins/Default/Eq_ex.bmp >@@ -39,16 +41,36 @@ > share/bmp/Skins/Default/readme.txt > share/bmp/Skins/Default/screenshot.bmp > share/bmp/Skins/Default/vIscolor.txt >-share/bmp/beep_logo.xpm >-share/bmp/beep.svg >-share/applications/beep.desktop >+share/icons/bmp.svg >+share/bmp/glade/equalizerwin_preset_menu.glade >+share/bmp/glade/prefswin.glade >+share/bmp/images/appearance.png >+share/bmp/images/mouse.png >+share/bmp/images/playlist.png >+share/bmp/images/plugins.png >+share/bmp/images/eq.png > share/locale/fr/LC_MESSAGES/bmp.mo >+share/locale/cy/LC_MESSAGES/bmp.mo >+share/locale/de/LC_MESSAGES/bmp.mo >+share/locale/es/LC_MESSAGES/bmp.mo >+share/locale/it/LC_MESSAGES/bmp.mo >+share/locale/ja/LC_MESSAGES/bmp.mo >+share/locale/ko/LC_MESSAGES/bmp.mo >+share/locale/lt/LC_MESSAGES/bmp.mo >+share/locale/nl/LC_MESSAGES/bmp.mo >+share/locale/pl/LC_MESSAGES/bmp.mo >+share/locale/ru/LC_MESSAGES/bmp.mo >+share/locale/sv/LC_MESSAGES/bmp.mo >+share/locale/zh_CN/LC_MESSAGES/bmp.mo >+@dirrm share/beep/Skins >+@dirrm share/beep > @dirrm share/bmp/Skins/Default > @dirrm share/bmp/Skins >+@dirrm share/bmp/glade >+@dirrm share/bmp/images > @dirrm share/bmp > @dirrm lib/bmp/Visualization > @dirrm lib/bmp/Output > @dirrm lib/bmp/Input > @dirrm lib/bmp > @dirrm include/bmp >-@dirrm include/beep
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=46067">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 70825
: 46067