Index: audio/Makefile =================================================================== --- audio/Makefile (révision 548840) +++ audio/Makefile (copie de travail) @@ -383,6 +383,7 @@ SUBDIR += libbpm SUBDIR += libbs2b SUBDIR += libcanberra + SUBDIR += libcanberra-gtk2 SUBDIR += libcanberra-gtk3 SUBDIR += libcdaudio SUBDIR += libcddb Index: audio/libcanberra/Makefile =================================================================== --- audio/libcanberra/Makefile (révision 548840) +++ audio/libcanberra/Makefile (copie de travail) @@ -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/ @@ -16,50 +16,55 @@ LICENSE_FILE= ${WRKSRC}/LGPL LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ - libltdl.so:devel/libltdl + libltdl.so:devel/libltdl \ + libpulse.so:audio/pulseaudio USES= gmake gnome libtool pathfix pkgconfig tar:xz -USE_GNOME= gnomeprefix gtk20 +USE_GNOME= gnomeprefix glib20 +USE_GSTREAMER1= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa +CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa \ + --without-html-dir \ + --without-systemdsystemunitdir CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -.if defined(SLAVEPORT) -OPTIONS_DEFINE= PULSEAUDIO GSTREAMER -.endif +_SLAVE_PORT?= main PLIST_SUB= VERSION=${PORTVERSION} -.include - -.if defined(SLAVEPORT) -USE_GNOME+= gtk30 -LIB_DEPENDS+= libcanberra.so:audio/libcanberra -CONFIGURE_ARGS+=--enable-gtk3 +.if ${_SLAVE_PORT} == main +CONFIGURE_ARGS+=--disable-gtk3 \ + --disable-gtk .else -CONFIGURE_ARGS+=--disable-gtk3 +PKGNAMESUFFIX= -${_SLAVE_PORT} -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:audio/pulseaudio -PLIST_SUB+= PULSE="" -.else -CONFIGURE_ARGS+=--disable-pulse -PLIST_SUB+= PULSE="@comment " +LIB_DEPENDS+= libcanberra.so:audio/libcanberra \ + libharfbuzz.so:print/harfbuzz + +USES+= xorg +USE_GNOME+= atk cairo gdkpixbuf2 pango +USE_XORG= x11 + +INSTALL_TARGET= # empty .endif -.if ${PORT_OPTIONS:MGSTREAMER} -USE_GSTREAMER1= yes -PLIST_SUB+= GSTREAMER="" -.else -CONFIGURE_ARGS+=--disable-gstreamer -PLIST_SUB+= GSTREAMER="@comment " +# GTK slave ports +.if ${_SLAVE_PORT} == gtk2 +# It avoids conflict +LIB_DEPENDS+= libcanberra-gtk3.so:audio/libcanberra-gtk3 + +USE_GNOME+= gtk20 + +CONFIGURE_ARGS+=--disable-gtk3 --enable-gtk +.elif ${_SLAVE_PORT} == gtk3 +USE_GNOME+= gtk30 + +CONFIGURE_ARGS+=--enable-gtk3 --disable-gtk .endif -.endif # end slaveport - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure Index: audio/libcanberra/pkg-plist =================================================================== --- audio/libcanberra/pkg-plist (révision 548840) +++ audio/libcanberra/pkg-plist (copie de travail) @@ -1,35 +1,11 @@ -bin/canberra-gtk-play -include/canberra-gtk.h include/canberra.h -lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop -lib/gtk-2.0/modules/libcanberra-gtk-module.so -lib/libcanberra-gtk.so -lib/libcanberra-gtk.so.0 -lib/libcanberra-gtk.so.0.1.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-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 +lib/libcanberra-%%VERSION%%/libcanberra-pulse.so libdata/pkgconfig/libcanberra.pc -%%DOCSDIR%%/README -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libcanberra-canberra-gtk.html -%%DOCSDIR%%/libcanberra-canberra.html -%%DOCSDIR%%/libcanberra.devhelp2 -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -share/gnome/autostart/libcanberra-login-sound.desktop -share/gnome/shutdown/libcanberra-logout-sound.sh -share/vala/vapi/libcanberra-gtk.vapi share/vala/vapi/libcanberra.vapi Index: audio/libcanberra-gtk2/Makefile =================================================================== --- audio/libcanberra-gtk2/Makefile (révision 548840) +++ audio/libcanberra-gtk2/Makefile (copie de travail) @@ -3,29 +3,26 @@ # $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ CATEGORIES= audio devel -PKGNAMESUFFIX= -gtk3 MAINTAINER= desktop@FreeBSD.org -COMMENT= Implementation of the Freedesktop sound theme spec +COMMENT= Gtk+ 2 bindings for libcanberra 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 +_SLAVE_PORT= gtk2 do-install: - ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ + @${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ + .for i in .so .so.0 .so.0.1.9 - ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \ + ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk${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 + @cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtkmoduleLTLIBRARIES +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules/libcanberra-gtk-module.so + .include "${MASTERDIR}/Makefile" Index: audio/libcanberra-gtk2/pkg-plist =================================================================== --- audio/libcanberra-gtk2/pkg-plist (révision 548840) +++ audio/libcanberra-gtk2/pkg-plist (copie de travail) @@ -1,6 +1,5 @@ -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/gtk-2.0/modules/libcanberra-gtk-module.so +lib/libcanberra-gtk.so +lib/libcanberra-gtk.so.0 +lib/libcanberra-gtk.so.0.1.9 +libdata/pkgconfig/libcanberra-gtk.pc Index: audio/libcanberra-gtk3/Makefile =================================================================== --- audio/libcanberra-gtk3/Makefile (révision 548840) +++ audio/libcanberra-gtk3/Makefile (copie de travail) @@ -3,29 +3,51 @@ # $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ CATEGORIES= audio devel -PKGNAMESUFFIX= -gtk3 MAINTAINER= desktop@FreeBSD.org -COMMENT= Implementation of the Freedesktop sound theme spec +COMMENT= Gtk+ 3 bindings for libcanberra 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 +_SLAVE_PORT= gtk3 +pre-build: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnome-settings-daemon-3.0/gtk-modules + @${MKDIR} ${STAGEDIR}${PREFIX}/share/gdm/autostart/LoginWindow + @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/autostart + @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/shutdown + @${MKDIR} ${STAGEDIR}${PREFIX}/share/vala/vapi + do-install: - ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ + @${INSTALL_SCRIPT} ${WRKSRC}/src/.libs/canberra-gtk-play \ + ${STAGEDIR}${PREFIX}/bin/ + + @${INSTALL_DATA} ${WRKSRC}/src/canberra-gtk.h \ + ${STAGEDIR}${PREFIX}/include/ + @${INSTALL_DATA} ${WRKSRC}/src/canberra-gtk-module.desktop \ + ${STAGEDIR}${PREFIX}/lib/gnome-settings-daemon-3.0/gtk-modules/ + @${INSTALL_DATA} ${WRKSRC}/src/libcanberra-ready-sound.desktop \ + ${STAGEDIR}${PREFIX}/share/gdm/autostart/LoginWindow/ + @${INSTALL_DATA} ${WRKSRC}/src/libcanberra-login-sound.desktop \ + ${STAGEDIR}${PREFIX}/share/gnome/autostart/ + @${INSTALL_SCRIPT} ${WRKSRC}/src/libcanberra-logout-sound.sh \ + ${STAGEDIR}${PREFIX}/share/gnome/shutdown/ + @${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ + @${INSTALL_DATA} ${WRKSRC}/vala/libcanberra-gtk.vapi \ + ${STAGEDIR}${PREFIX}/share/vala/vapi/ + .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 + @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 +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/canberra-gtk-play + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk3-module.so + .include "${MASTERDIR}/Makefile" Index: audio/libcanberra-gtk3/pkg-plist =================================================================== --- audio/libcanberra-gtk3/pkg-plist (révision 548840) +++ audio/libcanberra-gtk3/pkg-plist (copie de travail) @@ -1,3 +1,6 @@ +bin/canberra-gtk-play +include/canberra-gtk.h +lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop lib/gtk-3.0/modules/libcanberra-gtk-module.so lib/gtk-3.0/modules/libcanberra-gtk3-module.so lib/libcanberra-gtk3.so @@ -4,3 +7,7 @@ lib/libcanberra-gtk3.so.0 lib/libcanberra-gtk3.so.0.1.9 libdata/pkgconfig/libcanberra-gtk3.pc +share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +share/gnome/autostart/libcanberra-login-sound.desktop +share/gnome/shutdown/libcanberra-logout-sound.sh +share/vala/vapi/libcanberra-gtk.vapi