gentoo auto-resync : 21:03:2024 - 07:00:13

3 files changed, 22 insertions, 12 deletions

diff --git a/media-libs/quirc/Manifest b/media-libs/quirc/Manifest
index 77205801bf77..bcac6ed410d4 100644
--- a/media-libs/quirc/Manifest
+++ b/media-libs/quirc/Manifest
@@ -1,4 +1,4 @@
 DIST quirc-1.2.tar.gz 42916 BLAKE2B f12e015a703807e1e8aa6dbfcbedc4065a7249df2e3b902f6fb069c12e3d8905329414fa826f912adad8bd1ccd49b659d96ebcdcf6bc0b229eb112a46bf86b09 SHA512 0f694d16bc24012ef29a9aab8e48419bc7c346153ead3feed8e83845927f9683bb62b2e61c6872643f66b0c864c2e3c7e1a4ea4c657399b38cabfa687bedee82
-EBUILD quirc-1.2.ebuild 1657 BLAKE2B 532a234831d8a7b3a982bec725f54fad3de61bdaf1962d7916866f8d6e5d16002efdb029a7f6842f50bf49b5d6ff0b3bddc8a1e39736a8e4c0c8582e36d5f547 SHA512 a121639418fcb1050cfaf96bfc56c5731f0f9009c531ab0732131e9a7b9b3a994755aabce86f32e24becff84e7947989e9fb0a06dd51d9c3b3bab496b430f015
-EBUILD quirc-9999.ebuild 1657 BLAKE2B 532a234831d8a7b3a982bec725f54fad3de61bdaf1962d7916866f8d6e5d16002efdb029a7f6842f50bf49b5d6ff0b3bddc8a1e39736a8e4c0c8582e36d5f547 SHA512 a121639418fcb1050cfaf96bfc56c5731f0f9009c531ab0732131e9a7b9b3a994755aabce86f32e24becff84e7947989e9fb0a06dd51d9c3b3bab496b430f015
+EBUILD quirc-1.2-r1.ebuild 1914 BLAKE2B 395d2eae51a6cb47130b9b4b9586c5d74debc3f3b37c1f0c5a72049030834435e3749e5a03960596f32b96faa96abebead0e08b66d20375da2f8e9cef12d5dc1 SHA512 e3438bc824a7e5b2ccada0724258091afe850b8fecab72d0bd8fd9196ea31076062fa24ff3bcb93f7cb9e7b6f7e66301c07e3f7bd73ef45a53a4961e343b0522
+EBUILD quirc-9999.ebuild 1914 BLAKE2B 395d2eae51a6cb47130b9b4b9586c5d74debc3f3b37c1f0c5a72049030834435e3749e5a03960596f32b96faa96abebead0e08b66d20375da2f8e9cef12d5dc1 SHA512 e3438bc824a7e5b2ccada0724258091afe850b8fecab72d0bd8fd9196ea31076062fa24ff3bcb93f7cb9e7b6f7e66301c07e3f7bd73ef45a53a4961e343b0522
 MISC metadata.xml 846 BLAKE2B a20c7b5f02ebfcae0dabd26ad6651c1f1605f1e26b506048d1f4b61e0de5bd23eaaa047187949067c94fc549b1e60b5c96d40c6e20eefbfc158e5ee36325eb13 SHA512 73bad8eb5f00a76bb9456a108550789a81f2c29cfbc477073bd0313ce73d76a8703caf6344eea511018b268956882960bc6a302f0b8241947195778e0b058b21
diff --git a/media-libs/quirc/quirc-1.2.ebuild b/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}"