aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/gogglesmm/Makefile22
-rw-r--r--audio/gogglesmm/distinfo4
-rw-r--r--audio/gogglesmm/files/patch-src__gap__ap_socket.cpp19
-rw-r--r--audio/gogglesmm/pkg-plist4
4 files changed, 17 insertions, 32 deletions
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index d93b0a4ae2cf..8ee68b0932e6 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gogglesmm
-PORTVERSION= 0.13.3
+PORTVERSION= 0.14.0
CATEGORIES= audio
MASTER_SITES= GH
@@ -12,13 +12,14 @@ COMMENT= Music collection manager and player
LICENSE= GPLv3
LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \
+ libdbus-1.so:${PORTSDIR}/devel/dbus \
libGLEW.so:${PORTSDIR}/graphics/glew \
libexpat.so:${PORTSDIR}/textproc/expat2 \
libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}
-GH_COMMIT= 259f253
+GH_COMMIT= 8ccdb53
USES= compiler:c++0x desktop-file-utils gmake pkgconfig
USE_SQLITE= yes
@@ -31,13 +32,17 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --fox-prefix=${LOCALBASE} \
--without-rsound --without-mpcdec
INSTALLS_ICONS= yes
+USE_LDCONFIG= ${PREFIX}/lib/gogglesmm
+
+PORTDOCS= AUTHORS ChangeLog README
+
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -pthread
-OPTIONS_DEFINE= ALSA CDIO DBUS DOCS FAAD FFMPEG FLAC GCRYPT JACK \
+OPTIONS_DEFINE= ALSA CDIO DOCS FAAD FFMPEG FLAC GCRYPT JACK \
MAD MMS NLS OPUS PULSEAUDIO SAMPLERATE SMB TREMOR \
VORBIS WAVPACK
-OPTIONS_DEFAULT= CDIO DBUS FAAD FLAC MAD OPUS SAMPLERATE SMB \
+OPTIONS_DEFAULT= CDIO FAAD FLAC MAD OPUS SAMPLERATE SMB \
VORBIS WAVPACK
OPTIONS_SUB= yes
@@ -45,8 +50,8 @@ ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_CONFIGURE_OFF= --without-alsa
CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
CDIO_CONFIGURE_OFF= --without-cdda
-DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
-DBUS_CONFIGURE_OFF= --without-dbus
+#DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
+#DBUS_CONFIGURE_OFF= --without-dbus
FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad
FAAD_CONFIGURE_ON= --faad-prefix=${LOCALBASE}
FAAD_CONFIGURE_OFF= --without-faad
@@ -103,6 +108,7 @@ post-patch:
pre-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gogglesmm
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
@${MKDIR} ${STAGEDIR}${DATADIR}/utils
.for i in 16 22 24 32 48
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
@@ -111,8 +117,8 @@ pre-install:
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS ChangeLog README
- (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.for f in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so
diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo
index b546bb51c529..df02018d2bce 100644
--- a/audio/gogglesmm/distinfo
+++ b/audio/gogglesmm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gogglesmm-0.13.3.tar.gz) = e52695d3e2d328e047ba127bdc960e3935f2f19cfeb8bf99ecc202826ca09ea8
-SIZE (gogglesmm-0.13.3.tar.gz) = 1336269
+SHA256 (gogglesmm-0.14.0.tar.gz) = 41be6db4b3a8d6a33ed0a90ccad024ec8e6c4aea0eb5186ac2f5e08905f317f7
+SIZE (gogglesmm-0.14.0.tar.gz) = 1352015
diff --git a/audio/gogglesmm/files/patch-src__gap__ap_socket.cpp b/audio/gogglesmm/files/patch-src__gap__ap_socket.cpp
deleted file mode 100644
index 2ace852703f0..000000000000
--- a/audio/gogglesmm/files/patch-src__gap__ap_socket.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gap/ap_socket.cpp.orig
-+++ src/gap/ap_socket.cpp
-@@ -41,14 +41,14 @@
- #ifndef SOCK_CLOEXEC
- if (!ap_set_closeonexec(device)){
- ::close(device);
-- return BadHandle;
-+ return;
- }
- #endif
-
- #ifndef SOCK_NONBLOCK
- if (access&FXIO::NonBlocking && !ap_set_nonblocking(device)){
- ::close(device);
-- return BadHandle;
-+ return;
- }
- #endif
- }
diff --git a/audio/gogglesmm/pkg-plist b/audio/gogglesmm/pkg-plist
index 3bd7010d638d..6249114393ca 100644
--- a/audio/gogglesmm/pkg-plist
+++ b/audio/gogglesmm/pkg-plist
@@ -4,10 +4,8 @@ lib/gogglesmm/libgap_oss.so
%%PULSEAUDIO%%lib/gogglesmm/libgap_pulse.so
lib/gogglesmm/libgap_wav.so
man/man1/gogglesmm.1.gz
+share/appdata/gogglesmm.appdata.xml
share/applications/gogglesmm.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/utils/import_banshee_stats.py
%%DATADIR%%/utils/import_gogglesmm12.py
%%DATADIR%%/utils/import_gogglesmm12_stats.py