* [gentoo-commits] repo/gentoo:master commit in: media-libs/qimageblitz/, media-libs/qimageblitz/files/
@ 2016-05-02 8:02 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-05-02 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 093beb6a1945520416a5179bd5c77ab554ae09d8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 07:48:54 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon May 2 08:02:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093beb6a
media-libs/qimageblitz: Set minimum cmake version
Revision bump adds upstream patch which sets minimum cmake version.
Gentoo-bug: 581788
Package-Manager: portage-2.2.28
.../files/qimageblitz-0.0.6-cmake.patch | 12 +++++++
.../files/qimageblitz-0.0.6-exec-stack.patch | 9 +++++
.../qimageblitz/files/qimageblitz-0.0.6-gcc.patch | 4 +--
.../files/qimageblitz-9999-exec-stack.patch | 6 ++--
media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild | 40 ++++++++++++++++++++++
5 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
new file mode 100644
index 0000000..adb183d
--- /dev/null
+++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt (revision 1209280)
++++ b/CMakeLists.txt (revision 1209281)
+@@ -1,5 +1,7 @@
+ project(blitz)
+
++cmake_minimum_required(VERSION 2.6.4)
++
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+ find_package(Qt4 REQUIRED)
+ # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
new file mode 100644
index 0000000..170bd70
--- /dev/null
+++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
@@ -0,0 +1,9 @@
+Index: blitz/asm_scale.S
+===================================================================
+--- a/blitz/asm_scale.S (revision 1204247)
++++ b/blitz/asm_scale.S (revision 1204248)
+@@ -1,3 +1,4 @@
++.section .note.GNU-stack,"",%progbits
+
+ #if defined(__EMX__)
+ /* Due to strange behaviour of as.exe we use this macros */
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
index 9b4d812..b956d2d 100644
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
+++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
@@ -1,5 +1,5 @@
---- blitz/CMakeLists.txt
-+++ blitz/CMakeLists.txt
+--- a/blitz/CMakeLists.txt
++++ b/blitz/CMakeLists.txt
@@ -31,12 +31,8 @@
if(HAVE_MMX)
diff --git a/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch b/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch
index 8692c240..911c56b 100644
--- a/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch
+++ b/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch
@@ -1,6 +1,6 @@
-diff -uar qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S
---- qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200
-+++ qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200
+diff -Naur qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S
+--- a/qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200
++++ b/qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200
@@ -814,3 +814,7 @@
SIZE(qimageScale_mmx_AARGBA)
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
new file mode 100644
index 0000000..c57aa1c
--- /dev/null
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Graphical effect and filter library by KDE"
+HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+SLOT="0"
+IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-exec-stack.patch"
+ "${FILESDIR}/${P}-gcc.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DHAVE_ALTIVEC=$(usex altivec)
+ -DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
+ -DHAVE_MMX=$(usex cpu_flags_x86_mmx)
+ -DHAVE_SSE=$(usex cpu_flags_x86_sse)
+ -DHAVE_SSE2=$(usex cpu_flags_x86_sse2)
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qimageblitz/, media-libs/qimageblitz/files/
@ 2017-05-06 21:33 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-05-06 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 64e49bf02c10178003bd87bd27ad303bd3e118da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 23:52:04 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 6 21:20:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e49bf0
media-libs/qimageblitz: Add Qt5-based snapshot
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/qimageblitz/Manifest | 1 +
.../files/qimageblitz-0.0.6_p20131029-gcc.patch | 16 ++++++++
.../qimageblitz/qimageblitz-0.0.6_p20131029.ebuild | 43 ++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/media-libs/qimageblitz/Manifest b/media-libs/qimageblitz/Manifest
index c4e3a063d5b..8b2de06d2e2 100644
--- a/media-libs/qimageblitz/Manifest
+++ b/media-libs/qimageblitz/Manifest
@@ -1 +1,2 @@
DIST qimageblitz-0.0.6.tar.bz2 57617 SHA256 9f102269dec50641440e23a449df215a0db9efef9a3969939d618c5e78a5010f SHA512 dbd506c01622824efdec69640eb95e737d7848fa15d33351084a6499ca2321d7bc08e080d1e443f8ab9015cd2967c10d9b5aa2f3c6eaa7558153821c46133af9 WHIRLPOOL e13f5c11e2094296af558de4e9054d3c5a162be5e40a0418c5a505e222fe749c8dac319defc25bc2a2b6a5238e5d1fefb966fd64198d43b6b8af99d608362b45
+DIST qimageblitz-0.0.6_p20131029.tar.xz 43428 SHA256 256e7b4d7cfb6f061c6957ebdc6066e3a7fbf1d62b9ced35dc9c5467e5551622 SHA512 2a32105aed52ea33fbd46702a2b7cdd9671efef9bb52209ede534abc95ac40dd9ae2bd22cf09b30a309337653c4a754c50ef3fe4ad0aad7d4ffd0b5994a85981 WHIRLPOOL fd1593c7f77a334be4189bc6c3bdf365dd54363023318f3e25b0dd1aa53231b8d915582352ca29da35dd8a0d30958d120dd67cd4aaf2c81af79eb0e8388776cd
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-gcc.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-gcc.patch
new file mode 100644
index 00000000000..922a2629835
--- /dev/null
+++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-gcc.patch
@@ -0,0 +1,16 @@
+--- a/blitz/CMakeLists.txt
++++ b/blitz/CMakeLists.txt
+@@ -31,12 +31,8 @@
+
+ if(HAVE_MMX)
+ if(NOT APPLE AND NOT WIN32)
++ enable_language(ASM)
+ set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
+- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
+- COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
+- set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
+- set(HAVE_EXTERNAL_ASM TRUE)
+ endif(NOT APPLE AND NOT WIN32)
+ endif(HAVE_MMX)
+ configure_file (config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-processor.h )
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
new file mode 100644
index 00000000000..edeaa2ce759
--- /dev/null
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Graphical effect and filter library by KDE"
+HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
+SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug qt5"
+
+DEPEND="
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ !qt5? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DQT4_BUILD=$(usex !qt5)
+ -DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
+ -DHAVE_MMX=$(usex cpu_flags_x86_mmx)
+ -DHAVE_SSE=$(usex cpu_flags_x86_sse)
+ -DHAVE_SSE2=$(usex cpu_flags_x86_sse2)
+ )
+ use ppc && mycmakeargs+=( -DHAVE_ALTIVEC=$(usex altivec) )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qimageblitz/, media-libs/qimageblitz/files/
@ 2017-07-30 21:47 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-07-30 21:47 UTC (permalink / raw
To: gentoo-commits
commit: e9d0a0aa2be2a0430a66dd89b776d18cc63c393d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 30 21:46:06 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 21:47:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d0a0aa
media-libs/qimageblitz: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/qimageblitz-9999-exec-stack.patch | 11 -------
media-libs/qimageblitz/qimageblitz-0.0.6-r1.ebuild | 37 ----------------------
2 files changed, 48 deletions(-)
diff --git a/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch b/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch
deleted file mode 100644
index 911c56b48cc..00000000000
--- a/media-libs/qimageblitz/files/qimageblitz-9999-exec-stack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S
---- a/qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200
-+++ b/qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200
-@@ -814,3 +814,7 @@
- SIZE(qimageScale_mmx_AARGBA)
-
- #endif
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6-r1.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6-r1.ebuild
deleted file mode 100644
index c3f31b3219f..00000000000
--- a/media-libs/qimageblitz/qimageblitz-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A graphical effect and filter library for KDE4"
-HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="hppa"
-SLOT="0"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9999-exec-stack.patch"
- "${FILESDIR}/${P}-gcc.patch"
-)
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_has cpu_flags_x86_3dnow 3dnow)
- $(cmake-utils_use_has altivec)
- $(cmake-utils_use_has cpu_flags_x86_mmx mmx)
- $(cmake-utils_use_has cpu_flags_x86_sse sse)
- $(cmake-utils_use_has cpu_flags_x86_sse2 sse2)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-30 21:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-02 8:02 [gentoo-commits] repo/gentoo:master commit in: media-libs/qimageblitz/, media-libs/qimageblitz/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2017-05-06 21:33 Andreas Sturmlechner
2017-07-30 21:47 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox