From a13ee17386141690f7430a37c2eda5589f9f0ff9 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 1 Mar 2017 22:08:35 +0100 Subject: [PATCH] pnmixer: initial exheres, 0.6.1 --- .../files/pnmixer-0.6.1-pkg-config.patch | 83 +++++++++++++++++++ .../pnmixer/pnmixer-0.6.1.exheres-0 | 47 +++++++++++ 2 files changed, 130 insertions(+) create mode 100644 packages/media-sound/pnmixer/files/pnmixer-0.6.1-pkg-config.patch create mode 100644 packages/media-sound/pnmixer/pnmixer-0.6.1.exheres-0 diff --git a/packages/media-sound/pnmixer/files/pnmixer-0.6.1-pkg-config.patch b/packages/media-sound/pnmixer/files/pnmixer-0.6.1-pkg-config.patch new file mode 100644 index 00000000..a6b946c2 --- /dev/null +++ b/packages/media-sound/pnmixer/files/pnmixer-0.6.1-pkg-config.patch @@ -0,0 +1,83 @@ +Upstream: yes/submitted; first patch is from upstream, second is submitted +Source: https://github.com/nicklan/pnmixer/pull/114 + +From 418c1286b026d7a11e8c09f653326c2d05bafb5c Mon Sep 17 00:00:00 2001 +From: elboulangero +Date: Fri, 13 Nov 2015 20:50:20 +0100 +Subject: [PATCH 1/2] Use pkg-config to handle X11 library + +--- + configure.ac | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e698b7e..9359dc3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,17 +31,24 @@ pkg_modules="" + # Check that we have -lm and add it to LIBS + AC_CHECK_LIB(m,ceil,,AC_MSG_FAILURE([libm not found. Check 'config.log' for more details.])) + +-# Make sure we have X11, and also have it added to LIBS +-AC_CHECK_LIB(X11,XOpenDisplay,,AC_MSG_FAILURE([libX11 not found. Check 'config.log' for more details.])) ++# Make sure we have X11 ++echo -n "checking for x11... " ++if pkg-config --exists x11; then ++ echo "yes" ++ pkg_modules="$pkg_modules x11" ++else ++ echo "no" ++ AC_MSG_ERROR([x11 not found]) ++fi + + # Make sure we have Alsa +-echo -n "checking for alsasound ... " ++echo -n "checking for alsa... " + if pkg-config --exists alsa; then + echo "yes" + pkg_modules="$pkg_modules alsa" + else + echo "no" +- AC_MSG_ERROR(alsa not found) ++ AC_MSG_ERROR([alsa not found]) + fi + + # ======================================================= # +-- +2.6.3 + + +From 50c66bc4672a5c9c26197dbd51d2a03b04d98c4a Mon Sep 17 00:00:00 2001 +From: Kylie McClain +Date: Tue, 8 Dec 2015 11:39:53 -0500 +Subject: [PATCH 2/2] configure.ac: Use PKG_CONFIG if available + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9359dc3..54455d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,7 @@ AC_CHECK_LIB(m,ceil,,AC_MSG_FAILURE([libm not found. Check 'config.log' for more + + # Make sure we have X11 + echo -n "checking for x11... " +-if pkg-config --exists x11; then ++if ${PKG_CONFIG:-pkg-config} --exists x11; then + echo "yes" + pkg_modules="$pkg_modules x11" + else +@@ -43,7 +43,7 @@ fi + + # Make sure we have Alsa + echo -n "checking for alsa... " +-if pkg-config --exists alsa; then ++if ${PKG_CONFIG:-pkg-config} --exists alsa; then + echo "yes" + pkg_modules="$pkg_modules alsa" + else +-- +2.6.3 + diff --git a/packages/media-sound/pnmixer/pnmixer-0.6.1.exheres-0 b/packages/media-sound/pnmixer/pnmixer-0.6.1.exheres-0 new file mode 100644 index 00000000..a9a60aed --- /dev/null +++ b/packages/media-sound/pnmixer/pnmixer-0.6.1.exheres-0 @@ -0,0 +1,47 @@ +# Copyright 2015 Kylie McClain +# Distributed under the terms of the GNU General Public License v2 + +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] +require github [ user='nicklan' release="v0.6" suffix="tar.gz" ] + +SUMMARY="Simple ALSA mixer application designed to run in system tray" +SLOT="0" +LICENCES="GPL-3" + +MYOPTIONS=" + libnotify + ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]] +" + +PLATFORMS="~amd64" + +DEPENDENCIES=" + build: + dev-util/intltool + sys-devel/gettext + build+run: + dev-libs/glib:2 + sys-sound/alsa-lib + x11-libs/libX11 + libnotify? ( x11-libs/libnotify ) + providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0] ) + providers:gtk3? ( x11-libs/gtk+:3[>=3.6.0] ) + suggestion: + ( + media-sound/pavucontrol + xfce-extra/xfce4-mixer + ) [[ + *description = [ ${PN} can use a full mixer if available ] + ]] +" + +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-pkg-config.patch +) + +DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( + libnotify + 'providers:gtk3 gtk3' +) + +