Update gtkpod to 1.0.0 (latest headache proof version). This update also enable flac and ogg conversion, tested on amd64.
Comments, Ok? Martin Index: Makefile =================================================================== RCS file: /cvs/ports/audio/gtkpod/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 18 Oct 2011 18:57:15 -0000 1.41 +++ Makefile 14 Nov 2011 15:31:06 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.41 2011/10/18 18:57:15 sthen Exp $ COMMENT= GTK+2 program to synchronize an Apple iPod -DISTNAME= gtkpod-0.99.14 -REVISION= 7 +DISTNAME= gtkpod-1.0.0 CATEGORIES= audio x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} @@ -21,14 +20,15 @@ WANTLIB += Xcomposite Xdamage c cairo ex WANTLIB += pthread-stubs xcb z xml2 png glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0 pixman-1 WANTLIB += gio-2.0 id3tag gpod gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 curl -WANTLIB += glade-2.0 mp4v2 xcb-render GL xcb-shm +WANTLIB += glade-2.0 mp4v2 xcb-render GL xcb-shm FLAC ogg vorbis vorbisfile USE_GMAKE= Yes -USE_GROFF = Yes RUN_DEPENDS= devel/desktop-file-utils LIB_DEPENDS= audio/libid3tag \ audio/libgpod \ + audio/flac \ + audio/libvorbis \ devel/libglade2 \ net/curl \ multimedia/libmp4v2 @@ -36,11 +36,9 @@ LIB_DEPENDS= audio/libid3tag \ MODULES= devel/gettext textproc/intltool CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--without-hal \ - --without-gnome-vfs -# trampolines needed for display_playlists.c -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - CFLAGS="${CFLAGS} -ftrampolines" \ - CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ARGS+= --with-curl \ + --with-ogg \ + --with-flac +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -logg -lvorbis -lm" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/gtkpod/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- distinfo 6 Mar 2009 20:44:24 -0000 1.12 +++ distinfo 11 Nov 2011 18:23:13 -0000 @@ -1,5 +1,5 @@ -MD5 (gtkpod-0.99.14.tar.gz) = 95SOzrlVswL0xH2kwOHsEg== -RMD160 (gtkpod-0.99.14.tar.gz) = 7EgGkYMQswccM9Rhrzo1S1gmqEw= -SHA1 (gtkpod-0.99.14.tar.gz) = kpd0IMC1ToXdyA++LpnNSl5Ogbk= -SHA256 (gtkpod-0.99.14.tar.gz) = c+EoNIJnmuDMd0qkoHrslJFZgoizaYZQXsPRxqB37D0= -SIZE (gtkpod-0.99.14.tar.gz) = 1856919 +MD5 (gtkpod-1.0.0.tar.gz) = yt1ALc0c++3aA1e/JJZafA== +RMD160 (gtkpod-1.0.0.tar.gz) = Jx6a6yVJO4mTPyA+vOTABM4NpXM= +SHA1 (gtkpod-1.0.0.tar.gz) = d7doZjRYBppBTFm3qtKFAgyToDU= +SHA256 (gtkpod-1.0.0.tar.gz) = 2AiUVdCJuFOQ2u/FIrfWBAPM8kWFpXyun0ewUvTyXxI= +SIZE (gtkpod-1.0.0.tar.gz) = 1899869 Index: patches/patch-scripts_gtkpod-convert-common_sh =================================================================== RCS file: patches/patch-scripts_gtkpod-convert-common_sh diff -N patches/patch-scripts_gtkpod-convert-common_sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-scripts_gtkpod-convert-common_sh 13 Nov 2011 18:06:36 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- scripts/gtkpod-convert-common.sh Sun Nov 13 19:05:33 2011 ++++ scripts/gtkpod-convert-common.sh Sun Nov 13 19:05:45 2011 +@@ -90,7 +90,7 @@ + case "$filetype" in + flac) decoder="flac" ; options="-d -c --" ;; + oga|ogg|ogv|ogx) +- decoder="oggdec" ; options="--output - --" ;; ++ decoder="oggdec" ; options="-Q --output - --" ;; + m4a) decoder="faad" ; options="-o -" ;; + wav) decoder="" ;; + *) exit 4 ;; Index: patches/patch-src_Makefile_in =================================================================== RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Makefile_in 13 Nov 2011 18:07:04 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/Makefile.in Sun Nov 13 17:32:12 2011 ++++ src/Makefile.in Sun Nov 13 17:33:08 2011 +@@ -282,7 +282,7 @@ + rb_rating_helper.c rb_rating_helper.h \ + rb_cell_renderer_rating.c rb_cell_renderer_rating.h + +-gtkpod_LDADD = $(LIBS) -lm $(INTLLIBS) -ldl @LIBOBJS@ ++gtkpod_LDADD = $(LIBS) -lm $(INTLLIBS) @LIBOBJS@ + EXTRA_DIST = getopt.h + CLEANFILES = date_parser.c date_parser2.c + all: all-am Index: patches/patch-src_mp4file_c =================================================================== RCS file: patches/patch-src_mp4file_c diff -N patches/patch-src_mp4file_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_mp4file_c 13 Nov 2011 18:07:16 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ +--- src/mp4file.c Sun Nov 13 17:27:50 2011 ++++ src/mp4file.c Sun Nov 13 17:47:00 2011 +@@ -35,6 +35,10 @@ + # include <endian.h> /* for be32toh () */ + #endif + ++#ifdef __OpenBSD__ ++#define be32toh betoh32 ++#endif ++ + #include "charset.h" + #include "itdb.h" + #include "misc.h" +@@ -375,11 +379,11 @@ + + void mp4_init() + { +- mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY); ++ mp4v2_handle = dlopen("libmp4v2.so", RTLD_LAZY); + + if (!mp4v2_handle) + { +- mp4v2_handle = dlopen("libmp4v2.so.0", RTLD_LAZY); ++ mp4v2_handle = dlopen("libmp4v2.so", RTLD_LAZY); + + if (!mp4v2_handle) + { Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/gtkpod/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 22 Dec 2009 15:43:15 -0000 1.10 +++ pkg/PLIST 13 Nov 2011 16:48:00 -0000 @@ -119,6 +119,7 @@ share/icons/hicolor/64x64/apps/gtkpod.pn share/icons/hicolor/scalable/ share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/gtkpod.svg +share/locale/ca/LC_MESSAGES/gtkpod.mo share/locale/de/LC_MESSAGES/gtkpod.mo share/locale/es/LC_MESSAGES/gtkpod.mo share/locale/fr/LC_MESSAGES/gtkpod.mo