early-access version 2853
This commit is contained in:
pineappleEA
19
externals/vcpkg/ports/libcanberra/03_onlyshowin_unity.patch
vendored
Executable file
19
externals/vcpkg/ports/libcanberra/03_onlyshowin_unity.patch
vendored
Executable file
@@ -0,0 +1,19 @@
|
||||
Description: Play login sound in Unity too
|
||||
if it's enabled (it's disabled by default in Ubuntu)
|
||||
Author: Michael Terry <michael.terry@canonical.com>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/803519
|
||||
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38883
|
||||
|
||||
Index: libcanberra/src/libcanberra-login-sound.desktop.in
|
||||
===================================================================
|
||||
--- libcanberra.orig/src/libcanberra-login-sound.desktop.in 2011-07-01 15:02:59.870772598 +0100
|
||||
+++ libcanberra/src/libcanberra-login-sound.desktop.in 2011-07-01 15:03:03.554772637 +0100
|
||||
@@ -3,7 +3,7 @@
|
||||
Name=GNOME Login Sound
|
||||
Comment=Plays a sound whenever you log in
|
||||
Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
|
||||
-OnlyShowIn=GNOME;
|
||||
+OnlyShowIn=GNOME;Unity;
|
||||
AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
|
||||
X-GNOME-Autostart-Phase=Application
|
||||
X-GNOME-Provides=login-sound
|
||||
70
externals/vcpkg/ports/libcanberra/gtk_dont_assume_x11.patch
vendored
Executable file
70
externals/vcpkg/ports/libcanberra/gtk_dont_assume_x11.patch
vendored
Executable file
@@ -0,0 +1,70 @@
|
||||
From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Meeks <michael.meeks@suse.com>
|
||||
Date: Fri, 9 Nov 2012 16:16:40 +0000
|
||||
Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays:
|
||||
broadway/wayland
|
||||
|
||||
---
|
||||
src/canberra-gtk-module.c | 15 +++++++++++++++
|
||||
src/canberra-gtk.c | 5 +++++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
|
||||
index 67791f0..c1532ab 100644
|
||||
--- a/src/canberra-gtk-module.c
|
||||
+++ b/src/canberra-gtk-module.c
|
||||
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
|
||||
gboolean ret = FALSE;
|
||||
Atom xembed;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return FALSE;
|
||||
+#endif
|
||||
+
|
||||
/* Gnome Panel applets are XEMBED windows. We need to make sure we
|
||||
* ignore them */
|
||||
|
||||
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
|
||||
index 34446f5..08cb668 100644
|
||||
--- a/src/canberra-gtk.c
|
||||
+++ b/src/canberra-gtk.c
|
||||
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
|
||||
guchar *data = NULL;
|
||||
gint ret = -1;
|
||||
|
||||
+#ifdef GDK_IS_X11_DISPLAY
|
||||
+ if (!GDK_IS_X11_DISPLAY(d))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
|
||||
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
|
||||
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
14
externals/vcpkg/ports/libcanberra/macos_fix.patch
vendored
Executable file
14
externals/vcpkg/ports/libcanberra/macos_fix.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f68602d..1451747 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -115,8 +115,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
||||
AC_SUBST([WARNINGFLAGS], $with_cflags)
|
||||
|
||||
CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
|
||||
- -Wl,--as-needed \
|
||||
- -Wl,--gc-sections])
|
||||
+])
|
||||
AC_SUBST([GCLDFLAGS], $with_ldflags)
|
||||
|
||||
#### libtool stuff ####
|
||||
12
externals/vcpkg/ports/libcanberra/pkgconfig.patch
vendored
Executable file
12
externals/vcpkg/ports/libcanberra/pkgconfig.patch
vendored
Executable file
@@ -0,0 +1,12 @@
|
||||
diff --git a/libcanberra.pc.in b/libcanberra.pc.in
|
||||
index 0a5c7a1..91a9e39 100644
|
||||
--- a/libcanberra.pc.in
|
||||
+++ b/libcanberra.pc.in
|
||||
@@ -7,5 +7,7 @@ Name: libcanberra
|
||||
Description: Event Sound API
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${libdir} -lcanberra @PTHREAD_LIBS@
|
||||
+Libs.private: @LIBS_PRIVATE@
|
||||
Cflags: -D_REENTRANT -I${includedir}
|
||||
+Cflags.private: @CFLAGS_PRIVATE@
|
||||
Requires:
|
||||
92
externals/vcpkg/ports/libcanberra/portfile.cmake
vendored
Executable file
92
externals/vcpkg/ports/libcanberra/portfile.cmake
vendored
Executable file
@@ -0,0 +1,92 @@
|
||||
set(VERSION 0.30)
|
||||
set(PATCHES
|
||||
pkgconfig.patch
|
||||
undefined_reference.diff # https://sources.debian.org/patches/libcanberra/0.30-7/
|
||||
gtk_dont_assume_x11.patch # likewise
|
||||
03_onlyshowin_unity.patch # likewise
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
list(APPEND PATCHES macos_fix.patch)
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with brew install automake libtool")
|
||||
else()
|
||||
message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with apt-get install automake libtool")
|
||||
endif()
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://0pointer.de/lennart/projects/${PORT}/${PORT}-${VERSION}.tar.xz"
|
||||
FILENAME "${PORT}-${VERSION}.tar.xz"
|
||||
SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
REF ${VERSION}
|
||||
PATCHES ${PATCHES}
|
||||
)
|
||||
|
||||
set(EXTRA_CPPFLAGS)
|
||||
set(EXTRA_LDFLAGS)
|
||||
|
||||
#libltdl fixes
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
execute_process(
|
||||
COMMAND brew --prefix libtool
|
||||
OUTPUT_VARIABLE BREW_LIBTOOL_PATH
|
||||
)
|
||||
string(STRIP ${BREW_LIBTOOL_PATH} BREW_LIBTOOL_PATH)
|
||||
|
||||
set(LIBS_PRIVATE "-L${BREW_LIBTOOL_PATH}/lib -lltdl")
|
||||
set(CFLAGS_PRIVATE "-I${BREW_LIBTOOL_PATH}/include")
|
||||
set(EXTRA_LDFLAGS "LDFLAGS=${LIBS_PRIVATE}")
|
||||
set(EXTRA_CPPFLAGS "CPPFLAGS=${CFLAGS_PRIVATE}")
|
||||
else()
|
||||
set(LIBS_PRIVATE "-lltdl")
|
||||
endif()
|
||||
|
||||
if (NOT "alsa" IN_LIST FEATURES)
|
||||
list(APPEND FEATURES_BACKENDS "--disable-alsa")
|
||||
endif()
|
||||
if (NOT "gstreamer" IN_LIST FEATURES)
|
||||
list(APPEND FEATURES_BACKENDS "--disable-gstreamer")
|
||||
endif()
|
||||
if (NOT "null" IN_LIST FEATURES)
|
||||
list(APPEND FEATURES_BACKENDS "--disable-null")
|
||||
endif()
|
||||
if (NOT "oss" IN_LIST FEATURES)
|
||||
list(APPEND FEATURES_BACKENDS "--disable-oss")
|
||||
endif()
|
||||
if (NOT "pulse" IN_LIST FEATURES)
|
||||
list(APPEND FEATURES_BACKENDS "--disable-pulse")
|
||||
endif()
|
||||
|
||||
|
||||
set(ENV{GTKDOCIZE} true)
|
||||
vcpkg_configure_make(
|
||||
AUTOCONFIG
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
--disable-gtk-doc
|
||||
--disable-lynx
|
||||
--disable-silent-rules
|
||||
--disable-tdb
|
||||
${FEATURES_BACKENDS}
|
||||
${EXTRA_CPPFLAGS}
|
||||
${EXTRA_LDFLAGS}
|
||||
)
|
||||
|
||||
vcpkg_install_make()
|
||||
|
||||
configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY)
|
||||
configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY)
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
40
externals/vcpkg/ports/libcanberra/undefined_reference.diff
vendored
Executable file
40
externals/vcpkg/ports/libcanberra/undefined_reference.diff
vendored
Executable file
@@ -0,0 +1,40 @@
|
||||
Description: Fix FTBFS with binutils-gold
|
||||
Author: Bart Martens <bartm@debian.org>
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555081
|
||||
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -341,6 +341,7 @@ libcanberra_gtk3_la_CFLAGS = \
|
||||
$(GTK3_CFLAGS)
|
||||
libcanberra_gtk3_la_LIBADD = \
|
||||
$(GTK3_LIBS) \
|
||||
+ -lX11 \
|
||||
libcanberra.la
|
||||
libcanberra_gtk3_la_LDFLAGS = \
|
||||
-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
|
||||
@@ -351,6 +352,8 @@ libcanberra_gtk3_module_la_CFLAGS = \
|
||||
$(GTK3_CFLAGS)
|
||||
libcanberra_gtk3_module_la_LIBADD = \
|
||||
$(GTK3_LIBS) \
|
||||
+ -lX11 \
|
||||
+ -lgmodule-2.0 \
|
||||
libcanberra.la \
|
||||
libcanberra-gtk3.la
|
||||
libcanberra_gtk3_module_la_LDFLAGS = \
|
||||
@@ -379,6 +382,7 @@ libcanberra_gtk_la_CFLAGS = \
|
||||
$(GTK_CFLAGS)
|
||||
libcanberra_gtk_la_LIBADD = \
|
||||
$(GTK_LIBS) \
|
||||
+ -lX11 \
|
||||
libcanberra.la
|
||||
libcanberra_gtk_la_LDFLAGS = \
|
||||
-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
|
||||
@@ -389,6 +393,8 @@ libcanberra_gtk_module_la_CFLAGS = \
|
||||
$(GTK_CFLAGS)
|
||||
libcanberra_gtk_module_la_LIBADD = \
|
||||
$(GTK_LIBS) \
|
||||
+ -lX11 \
|
||||
+ -lgmodule-2.0 \
|
||||
libcanberra.la \
|
||||
libcanberra-gtk.la
|
||||
libcanberra_gtk_module_la_LDFLAGS = \
|
||||
53
externals/vcpkg/ports/libcanberra/vcpkg.json
vendored
Executable file
53
externals/vcpkg/ports/libcanberra/vcpkg.json
vendored
Executable file
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"name": "libcanberra",
|
||||
"version": "0.30",
|
||||
"port-version": 2,
|
||||
"description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops",
|
||||
"homepage": "http://0pointer.de/lennart/projects/libcanberra/",
|
||||
"supports": "!(windows | uwp)",
|
||||
"dependencies": [
|
||||
"libvorbis"
|
||||
],
|
||||
"default-features": [
|
||||
"defaults"
|
||||
],
|
||||
"features": {
|
||||
"alsa": {
|
||||
"description": "Enable optional ALSA support"
|
||||
},
|
||||
"defaults": {
|
||||
"description": "Default features",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "libcanberra",
|
||||
"features": [
|
||||
"null"
|
||||
],
|
||||
"platform": "osx"
|
||||
},
|
||||
{
|
||||
"name": "libcanberra",
|
||||
"features": [
|
||||
"alsa"
|
||||
],
|
||||
"platform": "linux"
|
||||
}
|
||||
]
|
||||
},
|
||||
"gstreamer": {
|
||||
"description": "Enable optional GStreamer support",
|
||||
"dependencies": [
|
||||
"gstreamer"
|
||||
]
|
||||
},
|
||||
"null": {
|
||||
"description": "Enable optional null output"
|
||||
},
|
||||
"oss": {
|
||||
"description": "Enable optional OSS support"
|
||||
},
|
||||
"pulse": {
|
||||
"description": "Enable optional PulseAudio support"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user