Version bump.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 134 insertions, 1 deletions

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index 199b991ad8e4..011959fa86ab 100644
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/qx11grab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.14 2012/03/01 22:30:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.15 2012/03/06 14:02:28 pesa Exp $
+
+*qx11grab-0.4.1 (06 Mar 2012)
+
+  06 Mar 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/0.4.1-fix-typos-in-CMakeLists.patch,
+  +files/0.4.1-optional-pulseaudio.patch, +qx11grab-0.4.1.ebuild:
+  Version bump.
 
   01 Mar 2012; Davide Pesavento <pesa@gentoo.org>
   -files/qx11grab-0.2.2-ffmpeg.patch, -qx11grab-0.2.2.ebuild,
diff --git a/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch b/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch
new file mode 100644
index 000000000000..d74a41dfc138
--- /dev/null
+++ b/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch
@@ -0,0 +1,24 @@
+diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
+--- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-06 14:30:53.127203576 +0100
++++ qx11grab-0.4.1/CMakeLists.txt	2012-03-06 14:31:40.214614902 +0100
+@@ -393,7 +393,7 @@
+ MESSAGE ("")
+ MESSAGE ("Optional Packages:")
+ summary (PULSE_FOUND "pulseaudio" TRUE)
+-summary (KDE_FOUND "kde4" TRUE)
++summary (KDE4_FOUND "kde4" TRUE)
+ MESSAGE ("")
+ 
+ ## EOF
+diff -Naur qx11grab-0.4.1.orig/src/filters/watermark/CMakeLists.txt qx11grab-0.4.1/src/filters/watermark/CMakeLists.txt
+--- qx11grab-0.4.1.orig/src/filters/watermark/CMakeLists.txt	2012-03-06 14:30:53.147203326 +0100
++++ qx11grab-0.4.1/src/filters/watermark/CMakeLists.txt	2012-03-06 14:32:00.158365566 +0100
+@@ -35,7 +35,7 @@
+ TARGET_LINK_LIBRARIES (${target_plugin}
+   ${QT_QTCORE_LIBRARY}
+   ${QT_QTGUI_LIBRARY}
+-  ${QT_QTBUS_LIBRARY}
++  ${QT_QTDBUS_LIBRARY}
+   qx11grabinterface
+ )
+ 
diff --git a/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch b/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch
new file mode 100644
index 000000000000..dfc74f9249fd
--- /dev/null
+++ b/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch
@@ -0,0 +1,42 @@
+diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
+--- qx11grab-0.4.1.orig/CMakeLists.txt	2012-03-06 14:41:47.888017941 +0100
++++ qx11grab-0.4.1/CMakeLists.txt	2012-03-06 14:46:32.774456369 +0100
+@@ -178,21 +178,26 @@
+ ## PulseAudio 
+ ##############################################################
+ 
+-SET (PULSE_SUFFIX "" CACHE STRING
+-  "pulse pkg-config or library file suffix (STRING)"
+-)
++OPTION (ENABLE_PULSE "Enable PulseAudio Support (ON/OFF)" OFF)
++IF (ENABLE_PULSE)
++  SET (PULSE_SUFFIX "" CACHE STRING
++    "pulse pkg-config or library file suffix (STRING)"
++  )
+ 
+-SET (PULSE_VERSION "0.9" CACHE STRING
+-  "Required libpulse${PULSE_SUFFIX} Version" FORCE
+-)
++  SET (PULSE_VERSION "0.9" CACHE STRING
++    "Required libpulse${PULSE_SUFFIX} Version" FORCE
++  )
+ 
+-PKG_CHECK_MODULES (PULSE 
+-  libpulse${PULSE_SUFFIX}>=${PULSE_VERSION}
+-)
++  PKG_CHECK_MODULES (PULSE 
++    libpulse${PULSE_SUFFIX}>=${PULSE_VERSION}
++  )
+ 
+-IF (PULSE_FOUND)
+-  ADD_DEFINITIONS (-DHAVE_PULSE)
+-ENDIF (PULSE_FOUND)
++  IF (PULSE_FOUND)
++    ADD_DEFINITIONS (-DHAVE_PULSE)
++  ELSE (PULSE_FOUND)
++    MESSAGE (FATAL_ERROR "PulseAudio not found")
++  ENDIF (PULSE_FOUND)
++ENDIF (ENABLE_PULSE)
+ 
+ ##############################################################
+ ## Xorg 
diff --git a/media-video/qx11grab/qx11grab-0.4.1.ebuild b/media-video/qx11grab/qx11grab-0.4.1.ebuild
new file mode 100644
index 000000000000..3c438441b55f
--- /dev/null
+++ b/media-video/qx11grab/qx11grab-0.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.1.ebuild,v 1.1 2012/03/06 14:02:28 pesa Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="X11 desktop video grabber tray"
+HOMEPAGE="http://qx11grab.hjcms.de/"
+SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde opengl pulseaudio"
+
+RDEPEND="
+	>=media-libs/alsa-lib-1.0.24
+	>=media-libs/fontconfig-2.4
+	>=media-libs/freetype-2.4:2
+	>=sys-apps/dbus-1.4.16
+	>=x11-libs/libX11-1.3.4
+	>=x11-libs/libXrandr-1.3
+	>=x11-libs/qt-core-4.7.2:4
+	>=x11-libs/qt-dbus-4.7.2:4
+	>=x11-libs/qt-gui-4.7.2:4[dbus]
+	>=virtual/ffmpeg-0.9[X,encode]
+	opengl? ( >=x11-libs/qt-opengl-4.7.2:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-1.1 )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+PDEPEND="
+	kde? ( >=kde-base/oxygen-icons-4.6 )
+	!kde? ( virtual/freedesktop-icon-theme )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-typos-in-CMakeLists.patch"
+	"${FILESDIR}/${PV}-optional-pulseaudio.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+
+	# install docs into standard Gentoo location
+	sed -i -e "s: share/\${CMAKE_PROJECT_NAME}: share/doc/${PF}:" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable kde KDE_SUPPORT)
+		$(cmake-utils_use_enable opengl)
+		$(cmake-utils_use_enable pulseaudio PULSE)
+	)
+	cmake-utils_src_configure
+}