diff --git a/audio/libcanberra-gtk2/Makefile b/audio/libcanberra-gtk2/Makefile index 80b43da73f6e..047d9d77e49c 100644 --- a/audio/libcanberra-gtk2/Makefile +++ b/audio/libcanberra-gtk2/Makefile @@ -1,7 +1,11 @@ # Created by: Joe Marcus Clarke # $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ MASTERDIR= ${.CURDIR:H}/libcanberra SLAVEPORT= gtk2 +post-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk2 + @${MV} ${STAGEDIR}/${PREFIX}/include/canberra-gtk.h ${STAGEDIR}/${PREFIX}/include/canberra-gtk2 + .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index cccd151f3676..2b81f4d539d7 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -1,7 +1,11 @@ # Created by: Joe Marcus Clarke # $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ MASTERDIR= ${.CURDIR:H}/libcanberra SLAVEPORT= gtk3 +post-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk3 + @${MV} ${STAGEDIR}/${PREFIX}/include/canberra-gtk.h ${STAGEDIR}/${PREFIX}/include/canberra-gtk3 + .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 4f2d3d9262a9..7535bb147d9f 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,64 +1,69 @@ # Created by: Joe Marcus Clarke # $MCom: ports/trunk/audio/libcanberra/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= libcanberra PORTVERSION= 0.30 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \ http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/ MAINTAINER= desktop@FreeBSD.org COMMENT= Implementation of the Freedesktop sound theme spec LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libltdl.so:devel/libltdl USES= gmake gnome localbase libtool pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa INSTALL_TARGET= install-strip SLAVEPORT?= PLIST_SUB= VERSION=${PORTVERSION} .if ${SLAVEPORT} != "" PKGNAMESUFFIX= -${SLAVEPORT} .endif .if ${SLAVEPORT:U} == gtk3 USE_GNOME+= gtk30 LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk3 \ - --disable-gtk + --disable-gtk \ + --disable-gstreamer \ + --disable-pulse PLIST_SUB+= BASE="@comment " GTK3="" GTK2="@comment " .elif ${SLAVEPORT:U} == gtk2 USE_GNOME+= gnomeprefix gtk20 LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk \ - --disable-gtk3 + --disable-gtk3 \ + --disable-gstreamer \ + --disable-pulse PLIST_SUB+= BASE="@comment " GTK3="@comment " GTK2="" .else CONFIGURE_ARGS+= --disable-gtk \ --disable-gtk3 PLIST_SUB+= BASE="" GTK3="@comment " GTK2="@comment " OPTIONS_DEFINE= PULSEAUDIO GSTREAMER OPTIONS_SUB= yes .endif PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO__CONFIGURE_ENABLE= pulse GSTREAMER_USES= gstreamer GSTREAMER_CONFIGURE_ENABLE= gstreamer post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure + .include diff --git a/audio/libcanberra/files/patch-libcanberra-gtk.pc.in b/audio/libcanberra/files/patch-libcanberra-gtk.pc.in new file mode 100644 index 000000000000..9fae2df88c29 --- /dev/null +++ b/audio/libcanberra/files/patch-libcanberra-gtk.pc.in @@ -0,0 +1,11 @@ +--- libcanberra-gtk.pc.in.orig 2022-05-19 16:04:44 UTC ++++ libcanberra-gtk.pc.in +@@ -1,7 +1,7 @@ libdir=@libdir@ + prefix=@prefix@ + exec_prefix=${prefix} + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/canberra-gtk2 + + Name: libcanberra-gtk + Description: Gtk Event Sound API diff --git a/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in b/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in new file mode 100644 index 000000000000..5238c31eac22 --- /dev/null +++ b/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in @@ -0,0 +1,11 @@ +--- libcanberra-gtk3.pc.in.orig 2022-05-19 16:04:19 UTC ++++ libcanberra-gtk3.pc.in +@@ -1,7 +1,7 @@ libdir=@libdir@ + prefix=@prefix@ + exec_prefix=${prefix} + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/canberra-gtk3 + + Name: libcanberra-gtk3 + Description: Gtk3 Event Sound API diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist index e92f3d0a6c9a..a24f785cf019 100644 --- a/audio/libcanberra/pkg-plist +++ b/audio/libcanberra/pkg-plist @@ -1,29 +1,30 @@ %%GTK2%%bin/canberra-gtk-play -%%GTK2%%include/canberra-gtk.h +%%GTK2%%include/canberra-gtk2/canberra-gtk.h +%%GTK3%%include/canberra-gtk3/canberra-gtk.h %%BASE%%include/canberra.h %%GTK2%%lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %%GTK2%%lib/gtk-2.0/modules/libcanberra-gtk-module.so %%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk-module.so %%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk3-module.so %%GTK2%%lib/libcanberra-gtk.so %%GTK2%%lib/libcanberra-gtk.so.0 %%GTK2%%lib/libcanberra-gtk.so.0.1.9 %%GTK3%%lib/libcanberra-gtk3.so %%GTK3%%lib/libcanberra-gtk3.so.0 %%GTK3%%lib/libcanberra-gtk3.so.0.1.9 %%BASE%%lib/libcanberra.so %%BASE%%lib/libcanberra.so.0 %%BASE%%lib/libcanberra.so.0.2.5 %%BASE%%%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so %%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-multi.so %%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-null.so %%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-oss.so %%BASE%%%%PULSEAUDIO%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so %%BASE%%libdata/pkgconfig/libcanberra.pc %%GTK2%%libdata/pkgconfig/libcanberra-gtk.pc %%GTK3%%libdata/pkgconfig/libcanberra-gtk3.pc %%GTK2%%share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop %%GTK2%%share/gnome/autostart/libcanberra-login-sound.desktop %%GTK2%%share/gnome/shutdown/libcanberra-logout-sound.sh %%GTK2%%share/vala/vapi/libcanberra-gtk.vapi %%BASE%%share/vala/vapi/libcanberra.vapi