Page MenuHomeFreeBSD
Files F140989073

D20830.id59289.diff
No OneTemporary
Actions

D20830.id59289.diff
View Options

Index: audio/Makefile
===================================================================
--- audio/Makefile
+++ audio/Makefile
@@ -378,7 +378,9 @@
SUBDIR += libbpm
SUBDIR += libbs2b
SUBDIR += libcanberra
+ SUBDIR += libcanberra-gstreamer
SUBDIR += libcanberra-gtk3
+ SUBDIR += libcanberra-pulse
SUBDIR += libcdaudio
SUBDIR += libcddb
SUBDIR += libcddb-doc
Index: audio/libcanberra-gstreamer/Makefile
===================================================================
--- audio/libcanberra-gstreamer/Makefile
+++ audio/libcanberra-gstreamer/Makefile
@@ -1,31 +1,21 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $
CATEGORIES= audio devel
-PKGNAMESUFFIX= -gtk3
+PKGNAMESUFFIX= -gstreamer
+PORTREVISION= 0
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Implementation of the Freedesktop sound theme spec
+COMMENT= Implementation of the Freedesktop sound theme spec (gstreamer backend)
MASTERDIR= ${.CURDIR}/../../audio/libcanberra
-SLAVEPORT= gtk3
PLIST= ${.CURDIR}/pkg-plist
do-build:
- cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la
+ cd ${BUILD_WRKSRC}/src && ${GMAKE} libcanberra${PKGNAMESUFFIX}.la
do-install:
- ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-.for i in .so .so.0 .so.0.1.9
- ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
- ${STAGEDIR}${PREFIX}/lib/
-.endfor
- cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES
- ${LN} -sf libcanberra-gtk3-module.so \
- ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION} && \
+ ${INSTALL_LIB} ${BUILD_WRKSRC}/src/.libs/libcanberra${PKGNAMESUFFIX}.so \
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/
.include "${MASTERDIR}/Makefile"
Index: audio/libcanberra-gstreamer/pkg-plist
===================================================================
--- audio/libcanberra-gstreamer/pkg-plist
+++ audio/libcanberra-gstreamer/pkg-plist
@@ -1,6 +1 @@
-lib/gtk-3.0/modules/libcanberra-gtk-module.so
-lib/gtk-3.0/modules/libcanberra-gtk3-module.so
-lib/libcanberra-gtk3.so
-lib/libcanberra-gtk3.so.0
-lib/libcanberra-gtk3.so.0.1.9
-libdata/pkgconfig/libcanberra-gtk3.pc
+lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
Index: audio/libcanberra-gtk3/Makefile
===================================================================
--- audio/libcanberra-gtk3/Makefile
+++ audio/libcanberra-gtk3/Makefile
@@ -4,12 +4,12 @@
CATEGORIES= audio devel
PKGNAMESUFFIX= -gtk3
+PORTREVISION= 1
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Implementation of the Freedesktop sound theme spec
+COMMENT= Implementation of the Freedesktop sound theme spec (GTK3 bindings)
MASTERDIR= ${.CURDIR}/../../audio/libcanberra
-SLAVEPORT= gtk3
PLIST= ${.CURDIR}/pkg-plist
do-build:
Index: audio/libcanberra-pulse/Makefile
===================================================================
--- audio/libcanberra-pulse/Makefile
+++ audio/libcanberra-pulse/Makefile
@@ -1,31 +1,21 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $
CATEGORIES= audio devel
-PKGNAMESUFFIX= -gtk3
+PKGNAMESUFFIX= -pulse
+PORTREVISION= 0
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Implementation of the Freedesktop sound theme spec
+COMMENT= Implementation of the Freedesktop sound theme spec (pulse backend)
MASTERDIR= ${.CURDIR}/../../audio/libcanberra
-SLAVEPORT= gtk3
PLIST= ${.CURDIR}/pkg-plist
do-build:
- cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la
+ cd ${BUILD_WRKSRC}/src && ${GMAKE} libcanberra${PKGNAMESUFFIX}.la
do-install:
- ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-.for i in .so .so.0 .so.0.1.9
- ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
- ${STAGEDIR}${PREFIX}/lib/
-.endfor
- cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES
- ${LN} -sf libcanberra-gtk3-module.so \
- ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION} && \
+ ${INSTALL_LIB} ${BUILD_WRKSRC}/src/.libs/libcanberra${PKGNAMESUFFIX}.so \
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/
.include "${MASTERDIR}/Makefile"
Index: audio/libcanberra-pulse/pkg-plist
===================================================================
--- audio/libcanberra-pulse/pkg-plist
+++ audio/libcanberra-pulse/pkg-plist
@@ -1,6 +1 @@
-lib/gtk-3.0/modules/libcanberra-gtk-module.so
-lib/gtk-3.0/modules/libcanberra-gtk3-module.so
-lib/libcanberra-gtk3.so
-lib/libcanberra-gtk3.so.0
-lib/libcanberra-gtk3.so.0.1.9
-libdata/pkgconfig/libcanberra-gtk3.pc
+lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
Index: audio/libcanberra/Makefile
===================================================================
--- audio/libcanberra/Makefile
+++ audio/libcanberra/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libcanberra
PORTVERSION= 0.30
-PORTREVISION= 5
+PORTREVISION?= 6
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \
http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/
@@ -18,46 +18,42 @@
LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \
libltdl.so:devel/libltdl
-USES= gmake gnome libtool pathfix pkgconfig tar:xz
+USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
USE_GNOME= gnomeprefix gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-.if defined(SLAVEPORT)
-OPTIONS_DEFINE= PULSEAUDIO GSTREAMER
-.endif
-
PLIST_SUB= VERSION=${PORTVERSION}
-.include <bsd.port.options.mk>
+.if defined(PKGNAMESUFFIX) # Slave ports for backends and GTK3
+LIB_DEPENDS+= libcanberra.so:audio/libcanberra
+CONFIGURE_ARGS+= --disable-null --disable-oss --disable-gtk
-.if defined(SLAVEPORT)
-USE_GNOME+= gtk30
-LIB_DEPENDS+= libcanberra.so:audio/libcanberra
-CONFIGURE_ARGS+=--enable-gtk3
-.else
-CONFIGURE_ARGS+=--disable-gtk3
+. if ${PKGNAMESUFFIX:M-gtk3}
+USE_GNOME+= cairo gdkpixbuf2 gtk30
+USE_XORG+= x11
+CONFIGURE_ARGS+= --enable-gtk3 \
+ --disable-pulse --disable-gstreamer --enable-null
+. endif
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= libpulse.so:audio/pulseaudio
-PLIST_SUB+= PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+= PULSE="@comment "
-.endif
+. if ${PKGNAMESUFFIX:M-pulse}
+LIB_DEPENDS+= libpulse.so:audio/pulseaudio
+CONFIGURE_ARGS+= --enable-pulse \
+ --disable-gtk3 --disable-gstreamer
+. endif
-.if ${PORT_OPTIONS:MGSTREAMER}
+. if ${PKGNAMESUFFIX:M-gstreamer}
USE_GSTREAMER1= yes
-PLIST_SUB+= GSTREAMER=""
-.else
-CONFIGURE_ARGS+=--disable-gstreamer
-PLIST_SUB+= GSTREAMER="@comment "
-.endif
+CONFIGURE_ARGS+= --enable-gstreamer \
+ --disable-gtk3 --disable-pulse
+. endif
+.else # Master
+CONFIGURE_ARGS+= --disable-gtk3 \
+ --disable-pulse \
+ --disable-gstreamer
.endif # end slaveport
post-patch:
Index: audio/libcanberra/pkg-plist
===================================================================
--- audio/libcanberra/pkg-plist
+++ audio/libcanberra/pkg-plist
@@ -9,11 +9,9 @@
lib/libcanberra.so
lib/libcanberra.so.0
lib/libcanberra.so.0.2.5
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
lib/libcanberra-%%VERSION%%/libcanberra-multi.so
lib/libcanberra-%%VERSION%%/libcanberra-null.so
lib/libcanberra-%%VERSION%%/libcanberra-oss.so
-%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
libdata/pkgconfig/libcanberra-gtk.pc
libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/README

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 11:32 AM (17 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27410130
Default Alt Text
D20830.id59289.diff (7 KB)

Event Timeline