2007/2/19, Landry Breuil <[EMAIL PROTECTED]>:
Hi list,
i updated pyr@ ports, found here :
http://marc.theaimsgroup.com/?l=openbsd-ports&m=116195003022828
to the most recent release of libmpd and gmpc.
libmpd builds/works fine for me on i386, but gmpc fails on make
package here. And as i'm new to ports infrastructure, i have a few
questions :
Okay, don't bother, i didn't understood that i had to work under /usr/ports.
- how does ports infrastructure handles .desktop files ? BSDMake
doesn't know how to handle them, i have to set USE_GMAKE=yes only for
one .desktop file... and previous version of port shipped .desktop
file, and i did not had problems building it. May desktop-file-utils
help ??
This question is still important, i don't understand why i have to set
USE_GMAKE=yes...
- gmpc depends on libSM for session management, is it 'the best way'
to add sm_CFLAGS and sm_LIBS to CONFIGURE_ENV ?
Please be indulgent, these are my first ports :)
And thanks for any comments/help/pointers to the right manpage (i've
already read openbsd.org/porting* and man bsd.port.mk..).
Landry
Finally, here are the diff -pruN against -current ports-tree.. way
cleaner than tarballs.
Comments ? Works fine here.
Landry
diff -pruN libmpd.orig/Makefile libmpd/Makefile
--- libmpd.orig/Makefile Mon Feb 19 20:05:27 2007
+++ libmpd/Makefile Mon Feb 19 20:22:46 2007
@@ -2,8 +2,7 @@
COMMENT= "mpd client library"
-DISTNAME= libmpd-0.12.0
-PKGNAME= ${DISTNAME}p0
+DISTNAME= libmpd-0.13.0
SHARED_LIBS= mpd 0.0
CATEGORIES= audio
@@ -15,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://download.sarine.nl/gmpc-0.13/
+MASTER_SITES= http://download.sarine.nl/gmpc-0.14.0/
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
diff -pruN libmpd.orig/distinfo libmpd/distinfo
--- libmpd.orig/distinfo Fri Oct 27 16:08:02 2006
+++ libmpd/distinfo Mon Feb 19 20:23:42 2007
@@ -1,4 +1,5 @@
-MD5 (libmpd-0.12.0.tar.gz) = bbfe28a5c3d7ef72b042030e3af52208
-RMD160 (libmpd-0.12.0.tar.gz) = 742f68d9c079dc879da7d3f784305bd29eb6d570
-SHA1 (libmpd-0.12.0.tar.gz) = eec09ff8a82a4c408f649a53dc6a1f475e97395a
-SIZE (libmpd-0.12.0.tar.gz) = 322359
+MD5 (libmpd-0.13.0.tar.gz) = a1109d36da9c5c9c6e5fed59309b783b
+RMD160 (libmpd-0.13.0.tar.gz) = 7eff11f5bc23ab36d9f67cdaefb9249aba4b2616
+SHA1 (libmpd-0.13.0.tar.gz) = 5efa8274a59e1b016f91e6fb14d72fc11b12f08c
+SHA256 (libmpd-0.13.0.tar.gz) = 81bd83f8d9907e68e55cd478b85ea3d2d841ac5b20b1832ad2c5e86f842e2c05
+SIZE (libmpd-0.13.0.tar.gz) = 364628
diff -pruN libmpd.orig/pkg/PLIST libmpd/pkg/PLIST
--- libmpd.orig/pkg/PLIST Fri Oct 27 16:08:02 2006
+++ libmpd/pkg/PLIST Mon Feb 19 20:25:16 2007
@@ -8,6 +8,7 @@ include/libmpd/libmpd-player.h
include/libmpd/libmpd-playlist.h
include/libmpd/libmpd-status.h
include/libmpd/libmpd-strfsong.h
+include/libmpd/libmpd-version.h
include/libmpd/libmpd.h
include/libmpd/libmpdclient.h
lib/libmpd.a
diff -pruN gmpc.orig/Makefile gmpc/Makefile
--- gmpc.orig/Makefile Sun Feb 11 01:56:57 2007
+++ gmpc/Makefile Mon Feb 19 20:31:58 2007
@@ -2,8 +2,7 @@
COMMENT= "gnome music player client"
-DISTNAME= gmpc-0.13.0
-PKGNAME= ${DISTNAME}p1
+DISTNAME= gmpc-0.14.0
CATEGORIES= audio
HOMEPAGE= http://sarine.nl/gmpc
@@ -15,13 +14,13 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xrender c fontconfig freetype m pthread z \
+WANTLIB= X11 Xext Xrender SM c fontconfig freetype m pthread z \
ICE SM atk-1.0 cairo gdk-x11-2.0 gdk_pixbuf-2.0 \
glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png xml2
-MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/
+MASTER_SITES= http://download.sarine.nl/gmpc-0.14.0/
MODULES= devel/gettext gcc3
@@ -30,12 +29,15 @@ MODGCC3_LANGS= c
USE_X11= Yes
USE_LIBTOOL= Yes
+USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
BUILD_DEPENDS= ::textproc/p5-XML-Parser
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= sm_CFLAGS="-I/usr/X11R6/include"
+CONFIGURE_ENV+= sm_LIBS="-L/usr/X11R6/lib"
LIB_DEPENDS= mpd.>=0::audio/libmpd \
glade-2.0::devel/libglade2
diff -pruN gmpc.orig/distinfo gmpc/distinfo
--- gmpc.orig/distinfo Fri Oct 27 16:11:16 2006
+++ gmpc/distinfo Mon Feb 19 20:32:54 2007
@@ -1,4 +1,5 @@
-MD5 (gmpc-0.13.0.tar.gz) = dbbb1880feb8b9c2493ece670520299b
-RMD160 (gmpc-0.13.0.tar.gz) = bcc9444346406d6a22a72e994bd183c6ede7c437
-SHA1 (gmpc-0.13.0.tar.gz) = 587adeb34786cad639dd426be864fe6be4398db1
-SIZE (gmpc-0.13.0.tar.gz) = 476926
+MD5 (gmpc-0.14.0.tar.gz) = 0c95f6a0a44ea4606eafdc7bb50b3bdb
+RMD160 (gmpc-0.14.0.tar.gz) = dd206257087a760109c70c09412550ea4d979ed8
+SHA1 (gmpc-0.14.0.tar.gz) = 99ffb52e2333eab039f96209d4f64fd921cca797
+SHA256 (gmpc-0.14.0.tar.gz) = 616220c92fe752d333ad77ba905d6ef9105453f2aa81747fcb74e812d2b80744
+SIZE (gmpc-0.14.0.tar.gz) = 692043
diff -pruN gmpc.orig/patches/patch-src-Makefile.in gmpc/patches/patch-src-Makefile.in
--- gmpc.orig/patches/patch-src-Makefile.in Thu Jan 1 01:00:00 1970
+++ gmpc/patches/patch-src-Makefile.in Mon Feb 19 20:29:39 2007
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig Sun Feb 18 01:10:43 2007
++++ src/Makefile.in Sun Feb 18 23:18:27 2007
+@@ -696,8 +696,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-gmpcincludeHEADERS uninstall-info-am
+
+--include Makefile.config
+-
+ revisiont.h:
+ if test '$(REVISION)' != '$(CONF_VERSION)'; then\
+ echo "Writing new Makefile.config file";\
diff -pruN gmpc.orig/patches/patch-src-TreeSearchWidget_c gmpc/patches/patch-src-TreeSearchWidget_c
--- gmpc.orig/patches/patch-src-TreeSearchWidget_c Fri Oct 27 16:11:16 2006
+++ gmpc/patches/patch-src-TreeSearchWidget_c Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
---- src/TreeSearchWidget.c.orig Wed Oct 25 19:25:08 2006
-+++ src/TreeSearchWidget.c Wed Oct 25 19:25:25 2006
-@@ -2,6 +2,7 @@
- #include <gtk/gtksignal.h>
- #include <gdk/gdkkeysyms.h>
- #include <regex.h>
-+#include <sys/types.h>
- #include "TreeSearchWidget.h"
- static void treesearch_class_init (TreeSearchClass *klass);
- static void treesearch_init (TreeSearch *ts);
diff -pruN gmpc.orig/patches/patch-src-main_c gmpc/patches/patch-src-main_c
--- gmpc.orig/patches/patch-src-main_c Fri Oct 27 16:11:16 2006
+++ gmpc/patches/patch-src-main_c Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
---- src/main.c.orig Wed Oct 25 19:53:00 2006
-+++ src/main.c Wed Oct 25 19:55:28 2006
-@@ -379,6 +379,8 @@
- {
- MpdData *data = NULL;
- long long new_playlist_id = mpd_playlist_get_playlist_id(connection);
-+ char *string;
-+
- /*
- * so I don't have to check all the time
- */
-@@ -387,7 +389,7 @@
- gchar buffer[1024];
- debug_printf(DEBUG_INFO, "playlist changed length: %i %i\n",info.playlist_length, mpd_playlist_get_playlist_length(mi));
- old_length = info.playlist_length;
-- char *string = cfg_get_single_value_as_string_with_default(config,
-+ string = cfg_get_single_value_as_string_with_default(config,
- "playlist","markup", DEFAULT_PLAYLIST_MARKUP);
-
- data = mpd_playlist_get_changes(mi,info.playlist_id);
-@@ -804,6 +806,7 @@
- void error_callback(MpdObj *mi, int error_id, char *error_msg, gpointer data)
- {
- int autoconnect = cfg_get_single_value_as_int_with_default(config, "connection","autoconnect", DEFAULT_AUTOCONNECT);
-+ GtkWidget *dialog;
- /* if we are not connected we show a reconnect */
- if(!mpd_check_connected(mi))
- {
-@@ -816,7 +819,7 @@
- gchar *path = gmpc_get_full_glade_path("gmpc.glade");
- xml_error_window = glade_xml_new(path,"error_dialog",NULL);
- g_free(path);
-- GtkWidget *dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
-+ dialog = glade_xml_get_widget(xml_error_window, "error_dialog");
- gtk_label_set_markup(GTK_LABEL(glade_xml_get_widget(xml_error_window,"em_label")), str);
- gtk_widget_show_all(dialog);
- g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(error_window_destroy), GINT_TO_POINTER(autoconnect));
diff -pruN gmpc.orig/patches/patch-src-misc_c gmpc/patches/patch-src-misc_c
--- gmpc.orig/patches/patch-src-misc_c Fri Oct 27 16:11:16 2006
+++ gmpc/patches/patch-src-misc_c Thu Jan 1 01:00:00 1970
@@ -1,23 +0,0 @@
---- src/misc.c.orig Wed Oct 25 19:28:10 2006
-+++ src/misc.c Wed Oct 25 19:29:26 2006
-@@ -23,16 +23,18 @@
-
- gchar * format_time(unsigned long seconds)
- {
-+
-+ GString *str;
- int days = seconds/86400;
- int houres = (seconds % 86400)/3600;
- int minutes = (seconds % 3600)/60;
- char *ret;
- if(seconds == 0)
- {
-- GString *str = g_string_new(NULL);
-+ str = g_string_new(NULL);
- return str->str;
- }
-- GString *str = g_string_new(" Total time: ");
-+ str = g_string_new(" Total time: ");
- if(days != 0)
- {
- g_string_append_printf(str, "%i days ", days);
diff -pruN gmpc.orig/patches/patch-src-player_c gmpc/patches/patch-src-player_c
--- gmpc.orig/patches/patch-src-player_c Fri Oct 27 16:11:16 2006
+++ gmpc/patches/patch-src-player_c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- src/player.c.orig Wed Oct 25 19:27:30 2006
-+++ src/player.c Wed Oct 25 19:27:58 2006
-@@ -300,6 +300,8 @@
-
- int update_player()
- {
-+ GtkRange *scale;
-+
- if(!xml_main_window) return FALSE;
- if(!mpd_check_connected(connection)) return FALSE;
- /* things that only need to be updated during playing */
-@@ -308,7 +310,7 @@
- int elapsedTime = mpd_status_get_elapsed_song_time(connection);
- /* update the progress bar */
- if(!seek){
-- GtkRange *scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
-+ scale = (GtkRange *)glade_xml_get_widget(xml_main_window, "progress_slider");
- gdouble prog = ((double)elapsedTime/(double)totalTime)*100;
- gtk_range_set_value(scale, prog);
- }
diff -pruN gmpc.orig/patches/patch-src-playlist3_c gmpc/patches/patch-src-playlist3_c
--- gmpc.orig/patches/patch-src-playlist3_c Fri Oct 27 16:11:16 2006
+++ gmpc/patches/patch-src-playlist3_c Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
---- src/playlist3.c.orig Wed Oct 25 19:26:07 2006
-+++ src/playlist3.c Wed Oct 25 19:27:03 2006
-@@ -105,10 +105,12 @@
- void pl3_initialize_tree()
- {
- int i;
-+ GtkTreePath *path;
-+ GtkTreeSelection *sel;
- if(pl3_xml == NULL) return;
-
-- GtkTreePath *path = gtk_tree_path_new_from_string("0");
-- GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
-+ path = gtk_tree_path_new_from_string("0");
-+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(pl3_xml, "cat_tree")));
- if((old_type&PLUGIN_ID_MARK || old_type&PLUGIN_ID_INTERNALL) != 0)
- {
- if(old_type >= 0)
diff -pruN gmpc.orig/pkg/PLIST gmpc/pkg/PLIST
--- gmpc.orig/pkg/PLIST Fri Oct 27 16:11:16 2006
+++ gmpc/pkg/PLIST Mon Feb 19 20:32:48 2007
@@ -1,35 +1,39 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/27 14:11:16 jasper Exp $
bin/gmpc
include/gmpc/
+include/gmpc/TreeSearchWidget.h
include/gmpc/config1.h
-include/gmpc/cover-art.h
+include/gmpc/gmpc_easy_download.h
+include/gmpc/metadata.h
include/gmpc/plugin.h
-include/gmpc/qthread.h
lib/pkgconfig/
lib/pkgconfig/gmpc.pc
share/applications/
share/applications/gmpc.desktop
share/gmpc/
-share/gmpc/add-browser.glade
+share/gmpc/gmpc-add-url.png
+share/gmpc/gmpc-loading-cover.png
+share/gmpc/gmpc-no-cover.png
+share/gmpc/gmpc-tray-disconnected.png
+share/gmpc/gmpc-tray-pause.png
+share/gmpc/gmpc-tray-play.png
share/gmpc/gmpc-tray.png
share/gmpc/gmpc.glade
share/gmpc/gmpc.png
-share/gmpc/icecast.png
share/gmpc/media-album.png
share/gmpc/media-artist.png
share/gmpc/media-audiofile.png
-share/gmpc/media-next.png
-share/gmpc/media-pause.png
-share/gmpc/media-play.png
share/gmpc/media-playlist.png
-share/gmpc/media-prev.png
-share/gmpc/media-stop.png
share/gmpc/media-stream.png
-share/gmpc/open-location.glade
share/gmpc/player-repeat.png
share/gmpc/player-shuffle.png
share/gmpc/playlist3.glade
+share/gmpc/stock_volume.png
+share/locale/de/LC_MESSAGES/gmpc.mo
share/locale/fr/LC_MESSAGES/gmpc.mo
+share/locale/gl/LC_MESSAGES/gmpc.mo
+share/locale/nl/LC_MESSAGES/gmpc.mo
+share/locale/pl/LC_MESSAGES/gmpc.mo
share/locale/ru/LC_MESSAGES/gmpc.mo
share/pixmaps/
share/pixmaps/gmpc.png
