summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-05-16 09:37:36 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-05-16 09:37:36 +0000
commitbc489588b1954483d80dbf64954574dad49a233b (patch)
tree7df0019a63a97d6ccf4b6f2664ce409bee41bd3b /media-video/qx11grab/files
parentAdjust amara mask so it doesn't collide with dev-zero's work (diff)
downloadhistorical-bc489588b1954483d80dbf64954574dad49a233b.tar.gz
historical-bc489588b1954483d80dbf64954574dad49a233b.tar.bz2
historical-bc489588b1954483d80dbf64954574dad49a233b.zip
Stable latest on amd64 and x86. Punt older.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'media-video/qx11grab/files')
-rw-r--r--media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch29
-rw-r--r--media-video/qx11grab/files/0.4.1-fix-install-destination.patch25
-rw-r--r--media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch24
-rw-r--r--media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch42
4 files changed, 0 insertions, 120 deletions
diff --git a/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch b/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch
deleted file mode 100644
index ad4dc3ce882e..000000000000
--- a/media-video/qx11grab/files/0.4.1-detect-avconv-presets-dir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- qx11grab-0.4.1.orig/CMakeLists.txt 2012-03-17 18:01:02.533911733 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt 2012-03-17 18:01:37.014480664 +0100
-@@ -155,8 +155,8 @@
-
- SET (FFMPEG_INCLUDEDIR ${FFMPEG_STATIC_INCLUDE_DIRS})
-
--FIND_PATH (_ffmpeg_sharedir
-- NAMES ffmpeg
-+FIND_FILE (FFMPEG_SHAREDIR
-+ NAMES ffmpeg avconv
- PATH_SUFFIXES ${FFMPEG_SUFFIX}
- PATHS
- /usr/share
-@@ -165,15 +165,8 @@
- $ENV{AVCONV_DATADIR}
- DOC "Find FFmpeg data directory for ffpreset files"
- NO_DEFAULT_PATH
-- NO_SYSTEM_ENVIRONMENT_PATH
-- NO_CMAKE_PATH
- )
-
--IF (_ffmpeg_sharedir)
-- SET (FFMPEG_SHAREDIR "${_ffmpeg_sharedir}/ffmpeg" CACHE PATH
-- "FFmpeg data directory for ffpreset files (PATH)")
--ENDIF (_ffmpeg_sharedir)
--
- ##############################################################
- ## PulseAudio
- ##############################################################
diff --git a/media-video/qx11grab/files/0.4.1-fix-install-destination.patch b/media-video/qx11grab/files/0.4.1-fix-install-destination.patch
deleted file mode 100644
index 70325762be8d..000000000000
--- a/media-video/qx11grab/files/0.4.1-fix-install-destination.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur qx11grab-0.4.1.orig/CMakeLists.txt qx11grab-0.4.1/CMakeLists.txt
---- qx11grab-0.4.1.orig/CMakeLists.txt 2012-03-17 20:12:08.421574605 +0100
-+++ qx11grab-0.4.1/CMakeLists.txt 2012-03-17 20:24:11.833530710 +0100
-@@ -318,7 +318,7 @@
-
- INSTALL (FILES
- ${ARCHIVE_OUTPUT_PATH}/qx11grab.1
-- DESTINATION share/man/man1/qx11grab.1
-+ DESTINATION share/man/man1/
- )
-
- ##############################################################
-diff -Naur qx11grab-0.4.1.orig/icons/CMakeLists.txt qx11grab-0.4.1/icons/CMakeLists.txt
---- qx11grab-0.4.1.orig/icons/CMakeLists.txt 2012-03-17 20:12:08.410574742 +0100
-+++ qx11grab-0.4.1/icons/CMakeLists.txt 2012-03-17 20:19:27.200089116 +0100
-@@ -20,7 +20,8 @@
- ## Pixmaps
- INSTALL (FILES
- qx11grab_36.png
-- DESTINATION share/pixmaps/qx11grab.png
-+ DESTINATION share/pixmaps/
-+ RENAME qx11grab.png
- COMPONENT data
- )
-
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
deleted file mode 100644
index d74a41dfc138..000000000000
--- a/media-video/qx11grab/files/0.4.1-fix-typos-in-CMakeLists.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index dfc74f9249fd..000000000000
--- a/media-video/qx11grab/files/0.4.1-optional-pulseaudio.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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