* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-07 0:26 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: e3dc8a15e5d3e6dc8280730aeb5933efb660c7fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 00:25:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 00:25:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dc8a15
media-libs/quirc: Keyword 1.2-r2 arm64, #935683
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 677271f2e53e..8fcd6a4f19c1 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-31 8:47 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2024-07-31 8:47 UTC (permalink / raw
To: gentoo-commits
commit: e174c352e9162682a006306a59e099163ff7842a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 08:46:35 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 08:46:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e174c352
media-libs/quirc: Stabilize 1.2-r2 x86, #936920
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index e9c1457c33dc..7f8f2bcdc801 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-31 8:47 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2024-07-31 8:47 UTC (permalink / raw
To: gentoo-commits
commit: ce7f1374969f56ff57a361219aeb453b757710be
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 08:46:08 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 08:46:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7f1374
media-libs/quirc: Stabilize 1.2-r2 amd64, #936920
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 5c0a7de84f3e..e9c1457c33dc 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-22 18:37 Arthur Zamarin
0 siblings, 0 replies; 11+ messages in thread
From: Arthur Zamarin @ 2024-07-22 18:37 UTC (permalink / raw
To: gentoo-commits
commit: ee617524aa534e0dd39ecdd1de71d205feb8c307
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 18:37:32 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 18:37:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee617524
media-libs/quirc: Keyword 1.2-r2 arm, #935683
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 097cc834fe77..5c0a7de84f3e 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-07 7:52 Yixun Lan
0 siblings, 0 replies; 11+ messages in thread
From: Yixun Lan @ 2024-07-07 7:52 UTC (permalink / raw
To: gentoo-commits
commit: b9c769a9da7f74e877c3baf51fb1a99db6302235
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 06:13:20 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 07:52:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c769a9
media-libs/quirc: Keyword 1.2-r2 riscv, #935683
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 9e7406797736..097cc834fe77 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-07 0:26 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 054a21cadc78eae7a8bb724f5b66824c3e2a2a94
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 00:25:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 00:25:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054a21ca
media-libs/quirc: Keyword 1.2-r2 ppc64, #935683
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 4031a9d83ff1..7864c3cb0684 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-07 0:26 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 595c607772111487ab160081434422a98118e566
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 00:25:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 00:25:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595c6077
media-libs/quirc: Keyword 1.2-r2 ppc, #935683
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 7864c3cb0684..9e7406797736 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-07-07 0:26 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 8c3716360b524da0a790fc9b7876563b6bdede3c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 00:25:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 00:25:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c371636
media-libs/quirc: Keyword 1.2-r2 sparc, #935683
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/quirc-1.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/quirc/quirc-1.2-r2.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
index 8fcd6a4f19c1..4031a9d83ff1 100644
--- a/media-libs/quirc/quirc-1.2-r2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="
https://github.com/dlbeer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
fi
DEPEND="
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-03-23 13:39 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-23 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 89f3d5d1f9ff6c6abd6427fbc839cb0d6108410e
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Mar 23 13:12:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 13:38:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f3d5d1
media-libs/quirc: fix so name
Closes: https://bugs.gentoo.org/927381
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35873
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/{quirc-1.2-r1.ebuild => quirc-1.2-r2.ebuild} | 4 ++--
media-libs/quirc/quirc-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/quirc/quirc-1.2-r1.ebuild b/media-libs/quirc/quirc-1.2-r2.ebuild
similarity index 94%
rename from media-libs/quirc/quirc-1.2-r1.ebuild
rename to media-libs/quirc/quirc-1.2-r2.ebuild
index 6264615597ee..677271f2e53e 100644
--- a/media-libs/quirc/quirc-1.2-r1.ebuild
+++ b/media-libs/quirc/quirc-1.2-r2.ebuild
@@ -56,14 +56,14 @@ multilib_src_configure() {
}
multilib_src_compile() {
- append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
+ append-ldflags "-Wl,-soname,libquirc.so.${LIB_VERSION}"
emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
}
multilib_src_install() {
dolib.so "libquirc.so.${LIB_VERSION}"
dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
- dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 "${LIB_VERSION}")"
if multilib_is_native_abi; then
into "/usr/libexec/${PN}"
diff --git a/media-libs/quirc/quirc-9999.ebuild b/media-libs/quirc/quirc-9999.ebuild
index 6264615597ee..677271f2e53e 100644
--- a/media-libs/quirc/quirc-9999.ebuild
+++ b/media-libs/quirc/quirc-9999.ebuild
@@ -56,14 +56,14 @@ multilib_src_configure() {
}
multilib_src_compile() {
- append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
+ append-ldflags "-Wl,-soname,libquirc.so.${LIB_VERSION}"
emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
}
multilib_src_install() {
dolib.so "libquirc.so.${LIB_VERSION}"
dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
- dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 "${LIB_VERSION}")"
if multilib_is_native_abi; then
into "/usr/libexec/${PN}"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-03-21 2:24 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-21 2:24 UTC (permalink / raw
To: gentoo-commits
commit: a8bfe44df5f6974ee113d0fce8f57bed123c8c0f
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 18:43:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 02:20:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bfe44d
media-libs/quirc: make libsdl non-optional, fix QA
The Makefile indiscriminately injects SDL_CFLAGS into QUIRC_CFLAGS
and QUIRC_CXXFLAGS.
Short of re-writing the whole Makefile we adhere to that dependency for now.
Set a SONAME to please QA.
Export CC and CXX.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35820
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../quirc/{quirc-1.2.ebuild => quirc-1.2-r1.ebuild} | 15 ++++++++++-----
media-libs/quirc/quirc-9999.ebuild | 15 ++++++++++-----
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/media-libs/quirc/quirc-1.2.ebuild b/media-libs/quirc/quirc-1.2-r1.ebuild
similarity index 73%
rename from media-libs/quirc/quirc-1.2.ebuild
rename to media-libs/quirc/quirc-1.2-r1.ebuild
index 3f7560659bd6..6264615597ee 100644
--- a/media-libs/quirc/quirc-1.2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DESCRIPTION="QR decoder library"
HOMEPAGE="https://github.com/dlbeer/quirc"
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
if [[ ${PV} = *9999* ]] ; then
inherit git-r3
@@ -21,6 +21,7 @@ fi
DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
+ media-libs/libsdl:=
opencv? ( media-libs/opencv:= )
sdl? ( media-libs/sdl-gfx:= )
"
@@ -34,8 +35,9 @@ SLOT="0/${PV}"
IUSE="opencv sdl tools v4l"
src_prepare() {
+ LIB_VERSION=$(grep '^LIB_VERSION = ' "${S}/Makefile" | cut -d ' ' -f 3 || die)
sed -r \
- -e "s#\.o libquirc.a#.o libquirc.so.${PV}#g" \
+ -e "s#\.o libquirc.a#.o libquirc.so.${LIB_VERSION}#g" \
-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
-i Makefile || die
@@ -44,6 +46,8 @@ src_prepare() {
}
multilib_src_configure() {
+ tc-export CC CXX
+
targets=( libquirc.so )
use opencv && targets+=( opencv )
use sdl && targets+=( sdl )
@@ -52,13 +56,14 @@ multilib_src_configure() {
}
multilib_src_compile() {
+ append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
}
multilib_src_install() {
- dolib.so "libquirc.so.${PV}"
- dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
- dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1)"
+ dolib.so "libquirc.so.${LIB_VERSION}"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
if multilib_is_native_abi; then
into "/usr/libexec/${PN}"
diff --git a/media-libs/quirc/quirc-9999.ebuild b/media-libs/quirc/quirc-9999.ebuild
index 3f7560659bd6..6264615597ee 100644
--- a/media-libs/quirc/quirc-9999.ebuild
+++ b/media-libs/quirc/quirc-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DESCRIPTION="QR decoder library"
HOMEPAGE="https://github.com/dlbeer/quirc"
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
if [[ ${PV} = *9999* ]] ; then
inherit git-r3
@@ -21,6 +21,7 @@ fi
DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
+ media-libs/libsdl:=
opencv? ( media-libs/opencv:= )
sdl? ( media-libs/sdl-gfx:= )
"
@@ -34,8 +35,9 @@ SLOT="0/${PV}"
IUSE="opencv sdl tools v4l"
src_prepare() {
+ LIB_VERSION=$(grep '^LIB_VERSION = ' "${S}/Makefile" | cut -d ' ' -f 3 || die)
sed -r \
- -e "s#\.o libquirc.a#.o libquirc.so.${PV}#g" \
+ -e "s#\.o libquirc.a#.o libquirc.so.${LIB_VERSION}#g" \
-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
-i Makefile || die
@@ -44,6 +46,8 @@ src_prepare() {
}
multilib_src_configure() {
+ tc-export CC CXX
+
targets=( libquirc.so )
use opencv && targets+=( opencv )
use sdl && targets+=( sdl )
@@ -52,13 +56,14 @@ multilib_src_configure() {
}
multilib_src_compile() {
+ append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
}
multilib_src_install() {
- dolib.so "libquirc.so.${PV}"
- dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
- dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1)"
+ dolib.so "libquirc.so.${LIB_VERSION}"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
+ dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
if multilib_is_native_abi; then
into "/usr/libexec/${PN}"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/
@ 2024-03-18 16:49 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-18 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 9d7d0bc2e8792cb1efe590975554b7006802d92b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 16:49:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 16:49:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7d0bc2
media-libs/quirc: fix src_prepare
Closes: https://bugs.gentoo.org/927252
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/quirc/quirc-1.2.ebuild | 1 +
media-libs/quirc/quirc-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-libs/quirc/quirc-1.2.ebuild b/media-libs/quirc/quirc-1.2.ebuild
index db42b3f36ce0..3f7560659bd6 100644
--- a/media-libs/quirc/quirc-1.2.ebuild
+++ b/media-libs/quirc/quirc-1.2.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
-i Makefile || die
+ default
multilib_copy_sources
}
diff --git a/media-libs/quirc/quirc-9999.ebuild b/media-libs/quirc/quirc-9999.ebuild
index db42b3f36ce0..3f7560659bd6 100644
--- a/media-libs/quirc/quirc-9999.ebuild
+++ b/media-libs/quirc/quirc-9999.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
-i Makefile || die
+ default
multilib_copy_sources
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-07-31 8:47 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-07 0:26 [gentoo-commits] repo/gentoo:master commit in: media-libs/quirc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-31 8:47 Joonas Niilola
2024-07-31 8:47 Joonas Niilola
2024-07-22 18:37 Arthur Zamarin
2024-07-07 7:52 Yixun Lan
2024-07-07 0:26 Sam James
2024-07-07 0:26 Sam James
2024-07-07 0:26 Sam James
2024-03-23 13:39 Sam James
2024-03-21 2:24 Sam James
2024-03-18 16:49 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox