* [gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/, media-gfx/argyllcms/files/
@ 2015-09-04 11:49 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2015-09-04 11:49 UTC (permalink / raw
To: gentoo-commits
commit: d20a5b7b33b4584fe47c0d570e2bdeab1d3d5549
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 11:43:38 2015 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 11:49:00 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20a5b7b
media-gfx/argyllcms: fix compilation with GCC 5
Bug #559534 by tetromino
Package-Manager: portage-2.2.20.1
media-gfx/argyllcms/argyllcms-1.8.0.ebuild | 1 +
media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
index c59a59a..eac1ccd 100644
--- a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=(
+ "${FILESDIR}"/${P}-gcc5.patch
)
src_compile() {
diff --git a/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch b/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
new file mode 100644
index 0000000..2806745
--- /dev/null
+++ b/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with GCC 5
+Author: James Cowgill <james410@cowgill.org.uk>
+Bug-Debian: https://bugs.debian.org/777779
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/icc/icc.h
++++ b/icc/icc.h
+@@ -100,7 +100,11 @@
+ #define CF64PREC "LL" /* Constant precision specifier */
+
+ #ifndef ATTRIBUTE_NORETURN
++#ifdef _MSC_VER
+ # define ATTRIBUTE_NORETURN __declspec(noreturn)
++#else
++# define ATTRIBUTE_NORETURN __attribute__((noreturn))
++#endif
+ #endif
+
+ #else /* !__STDC_VERSION__ */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/, media-gfx/argyllcms/files/
@ 2019-06-10 15:13 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2019-06-10 15:13 UTC (permalink / raw
To: gentoo-commits
commit: eb0c3024f6d00a0d8715a5f8ff65ceb123001f86
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 15:12:54 2019 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 15:12:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0c3024
media-gfx/argyllcms: drop old
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/argyllcms/Manifest | 4 -
media-gfx/argyllcms/argyllcms-1.9.2.ebuild | 93 ----------------------
media-gfx/argyllcms/argyllcms-2.0.0.ebuild | 89 ---------------------
media-gfx/argyllcms/argyllcms-2.0.1.ebuild | 89 ---------------------
media-gfx/argyllcms/argyllcms-2.1.0.ebuild | 89 ---------------------
.../argyllcms/files/argyllcms-1.8.0-gcc5.patch | 20 -----
6 files changed, 384 deletions(-)
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 8be7400b254..8a494cf00a3 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,5 +1 @@
-DIST Argyll_V1.9.2_src.zip 13624924 BLAKE2B 7035a1cd43b320acd3ccb6eeee46681e39f723a0d96c1ce0d880f3084e8c8a0201182c50cc3c4d9977937a846fb119ce0002810697d81c9301f7082fe8a524bd SHA512 f21fc2385b643dd6c32d1b1b0ab208a79ad8bc4319ac644d96e69ebc4c4e333d38b41e4516742816da9a91145e4f00bffb7f8b61a827859d5e14c1a8867b5a41
-DIST Argyll_V2.0.0_src.zip 13588152 BLAKE2B a299d7b4b2c76ac22c6761b4e25b4ee5751bd0771fb3d4c58dcb722aec1b413ab07fef35263e2dcb311d893bb16105072a83dd640720efbf160a59369fc88768 SHA512 44e9a2307bc39a8e455c15b2f4126de652a9ecd43bec94a841cb3da56896effcb023740d7e6b8991d109766c83426eee4b131a6c56cda5ff28b22a06ea470b5d
-DIST Argyll_V2.0.1_src.zip 13606682 BLAKE2B 156c94d538a868a90e59a009999ed35536ab84e27434c071613540c4afac1c7374f77eca73a38ca87220a0f1cff7213286312cb681d50a7e7e14b946788b8e0b SHA512 d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
-DIST Argyll_V2.1.0_src.zip 13823910 BLAKE2B 344520ba06055333858ebc1991939589fb276ee434a5d16c6eedbb318da1cff27a910298fdd0ced86f292d1e3564c6e0d6a2663cf7b80cbd4afcf2d49982b3f2 SHA512 9a74828c8cea8aac5795ab48b1531b2cbd43ea613e856eceb55ee291412eb5e8816f25f6bc620bd1bfb32eb8c08e87e85e821a2dcf0c25eac68d96184e8f8bca
DIST Argyll_V2.1.1_src.zip 13825860 BLAKE2B c1a748cf8ecd8e04164b0281e5cfb708386b196ea75bef6be02945d1a0cd1d191d069420628612ce0bd24028e40221a988becc3eba16293555376d20ab3a4bf5 SHA512 551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565
diff --git a/media-gfx/argyllcms/argyllcms-1.9.2.ebuild b/media-gfx/argyllcms/argyllcms-1.9.2.ebuild
deleted file mode 100644
index a7169af6a01..00000000000
--- a/media-gfx/argyllcms/argyllcms-1.9.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.0-gcc5.patch
- )
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-2.0.0.ebuild b/media-gfx/argyllcms/argyllcms-2.0.0.ebuild
deleted file mode 100644
index a90a7721a76..00000000000
--- a/media-gfx/argyllcms/argyllcms-2.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-2.0.1.ebuild b/media-gfx/argyllcms/argyllcms-2.0.1.ebuild
deleted file mode 100644
index 6b881b095c2..00000000000
--- a/media-gfx/argyllcms/argyllcms-2.0.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-2.1.0.ebuild b/media-gfx/argyllcms/argyllcms-2.1.0.ebuild
deleted file mode 100644
index fa22ef16302..00000000000
--- a/media-gfx/argyllcms/argyllcms-2.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch b/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
deleted file mode 100644
index 28067455c33..00000000000
--- a/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with GCC 5
-Author: James Cowgill <james410@cowgill.org.uk>
-Bug-Debian: https://bugs.debian.org/777779
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/icc/icc.h
-+++ b/icc/icc.h
-@@ -100,7 +100,11 @@
- #define CF64PREC "LL" /* Constant precision specifier */
-
- #ifndef ATTRIBUTE_NORETURN
-+#ifdef _MSC_VER
- # define ATTRIBUTE_NORETURN __declspec(noreturn)
-+#else
-+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
-+#endif
- #endif
-
- #else /* !__STDC_VERSION__ */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/, media-gfx/argyllcms/files/
@ 2024-10-10 11:11 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2024-10-10 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 53fcebd22e746831ff279673d9d548e5e235579b
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 11:10:22 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 11:10:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fcebd2
media-gfx/argyllcms: drop 2.1.2-r3
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/argyllcms/Manifest | 1 -
media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild | 93 --------------
.../files/argyllcms-2.1.2-fno-common.patch | 134 ---------------------
3 files changed, 228 deletions(-)
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index e87653a45df4..58f60a94b120 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,3 +1,2 @@
-DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
DIST Argyll_V3.2.0_src.zip 14690714 BLAKE2B a2bd45883c213c0906ce94be525f6d7fa6e7378925ad08cb8577819fb2d1b5f6a16b6600a9d4b15972df6048323726fbe8fd16a23010c4dc7461007e45f20362 SHA512 17e73e74d0581bf2c0bab17598bcaf8c2cc556e675e944a315cccc9ddf8c3a0b946c7d88f87b1e4d29d9edba222bc76a497f570affe1d15d08c5ceec2b1b995d
DIST Argyll_V3.3.0_src.zip 14761699 BLAKE2B 2ae04cbc973b9613f33f3b4ef4498a88a9bab8db4b26165e6bbb59478e3a8094a05714cdf4ac4aa7a41c65406596579e9ab33e59bbd7bbd5b38f4082542ee512 SHA512 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild
deleted file mode 100644
index b5f8e47cfd60..000000000000
--- a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/libjpeg-turbo:=
- media-libs/tiff:=
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- x11-libs/libXScrnSaver
- dev-libs/openssl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
- dev-util/ftjam"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # Make it respect LDFLAGS
- echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
- # Evil hack to get --as-needed working. The build system unfortunately lists all
- # the shared libraries by default on the command line _before_ the object to be built...
- echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
- append-cflags -DUNIX -D_THREAD_SAFE
-
- sed \
- -e 's:CCFLAGS:CFLAGS:g' \
- -e "s:ar rusc:$(tc-getAR) rusc:g" \
- -i Jambase || die
-
- tc-export CC RANLIB
-
- jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
- jam -dx -fJambase install || die
-
- rm bin/License.txt || die
-
- pushd bin > /dev/null
- local binname
- for binname in * ; do
- newbin ${binname} argyll-${binname}
- done
- popd > /dev/null
-
- dodoc log.txt Readme.txt ttbd.txt notes.txt
- if use doc; then
- docinto html
- dodoc doc/*html doc/*jpg doc/*gif
- fi
-
- insinto /usr/share/${PN}
- doins -r ref
-
- udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
- elog "If you have a Spyder2 you need to extract the firmware"
- elog "from the CVSpyder.dll of the windows driver package"
- elog "and store it as /usr/share/color/spyd2PLD.bin"
- echo
- elog "For further info on setting up instrument access read"
- elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- echo
-}
diff --git a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch
deleted file mode 100644
index 36bf87d12550..000000000000
--- a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-argyllcms: Fix compilation with GCC 10
-
-A common mistake in C is omitting extern when declaring a global variable
-in a header file. If the header is included by several files it results
-in multiple definitions of the same variable. In previous GCC versions
-this error is ignored. GCC 10 defaults to -fno-common, which means a
-linker error will now be reported. To fix this, use extern in header
-files when declaring global variables, and ensure each global is defined
-in exactly one C file. As a workaround, legacy C code can be compiled
-with -fcommon.
-
- int x; // tentative definition - avoid in header files
- extern int y; // correct declaration in a header file
-
-References:
-https://bugzilla.opensuse.org/show_bug.cgi?id=1160244
-https://bugzilla.opensuse.org/show_bug.cgi?id=1160256
-
-In case of vinflate.c and inflate.c, both files define local variables
-with the same name as global. It is no more possible with GCC 10. To
-prevent sharing variables across files, add "static" to all local
-variables.
-
-Index: Argyll_V2.1.2/gamut/gamut.h
-===================================================================
---- Argyll_V2.1.2.orig/gamut/gamut.h
-+++ Argyll_V2.1.2/gamut/gamut.h
-@@ -36,7 +36,7 @@
- #define MAXGAMN 10 /* Maximum gamut point neighbors returned */
- #define NSLOTS 6 /* Number of maximum direction slots */
-
--struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */
-+struct _vrml; /* Declared in vrml.h, which may be #included after this */
-
- /* ------------------------------------ */
- #define NODE_STRUCT \
-Index: Argyll_V2.1.2/spectro/vinflate.c
-===================================================================
---- Argyll_V2.1.2.orig/spectro/vinflate.c
-+++ Argyll_V2.1.2/spectro/vinflate.c
-@@ -92,7 +92,7 @@ int vinflate(void);
- */
-
- #define WSIZE 0x8000
--unsigned int wp; /* current position in slide */
-+static unsigned int wp; /* current position in slide */
- uch slide[32768];
-
- static int vflush_output(unsigned int w) {
-@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra
- the stream.
- */
-
--ulg bb; /* bit buffer */
--unsigned bk; /* bits in bit buffer */
-+static ulg bb; /* bit buffer */
-+static unsigned bk; /* bits in bit buffer */
-
- ush vmask_bits[] = {
- 0x0000,
-@@ -230,8 +230,8 @@ ush vmask_bits[] = {
- */
-
-
--int vlbits = 9; /* bits in base literal/length lookup table */
--int vdbits = 6; /* bits in base distance lookup table */
-+static int vlbits = 9; /* bits in base literal/length lookup table */
-+static int vdbits = 6; /* bits in base distance lookup table */
-
-
- /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
-@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base
- #define N_MAX 288 /* maximum number of codes in any set */
-
-
--unsigned hufts; /* track memory usage */
-+static unsigned hufts; /* track memory usage */
-
- /* Given a list of code lengths and a maximum table size, make a set of
- tables to decode that set of codes. Return zero on success, one if
-Index: Argyll_V2.1.2/spectro/inflate.c
-===================================================================
---- Argyll_V2.1.2.orig/spectro/inflate.c
-+++ Argyll_V2.1.2/spectro/inflate.c
-@@ -49,7 +49,7 @@ typedef unsigned int ulg;
- the next table, which codes e - 16 bits, and lastly e == 99 indicates
- an unused code. If a code with e == 99 is looked up, this implies an
- error in the data. */
--struct huft {
-+static struct huft {
- uch e; /* number of extra bits or operation */
- uch b; /* number of bits in this code or subcode */
- union {
-@@ -87,7 +87,7 @@ int inflate(void);
- /* unsigned wp; current position in slide */
-
- #define WSIZE 0x8000
--unsigned int wp; /* current position in slide */
-+static unsigned int wp; /* current position in slide */
- uch slide[32768];
-
- static int flush_output(unsigned int w) {
-@@ -155,8 +155,8 @@ static ush cpdext[] = { /* Extra
- the stream.
- */
-
--ulg bb; /* bit buffer */
--unsigned bk; /* bits in bit buffer */
-+static ulg bb; /* bit buffer */
-+static unsigned bk; /* bits in bit buffer */
-
- ush mask_bits[] = {
- 0x0000,
-@@ -201,8 +201,8 @@ ush mask_bits[] = {
- */
-
-
--int lbits = 9; /* bits in base literal/length lookup table */
--int dbits = 6; /* bits in base distance lookup table */
-+static int lbits = 9; /* bits in base literal/length lookup table */
-+static int dbits = 6; /* bits in base distance lookup table */
-
-
- /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
-@@ -210,7 +210,7 @@ int dbits = 6; /* bits in base
- #define N_MAX 288 /* maximum number of codes in any set */
-
-
--unsigned hufts; /* track memory usage */
-+static unsigned hufts; /* track memory usage */
-
-
- static int huft_build(b, n, s, d, e, t, m)
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-10 11:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-04 11:49 [gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/, media-gfx/argyllcms/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2019-06-10 15:13 Bernard Cafarelli
2024-10-10 11:11 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox