Patchwork [v2] libsdl 1.2.14: fix packaging

login
register
mail settings
Submitter Koen Kooi
Date Dec. 18, 2011, 10:09 a.m.
Message ID <1324202967-25143-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/17199/
State Accepted
Commit ae4118a1f78f113c3d687c3aa6a86007cf977cae
Headers show

Comments

Koen Kooi - Dec. 18, 2011, 10:09 a.m.
For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:

What we want, and how meta-oe used to do it:
	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk

Current OE-core status:
	libsdl_1.2.14-r2_armv7a.ipk

With this commit we get both proper shlib renaming and the -dev package now has all the dev files

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Dec. 19, 2011, 12:17 p.m.
On Sun, 2011-12-18 at 11:09 +0100, Koen Kooi wrote:
> For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
> 
> What we want, and how meta-oe used to do it:
> 	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
> 
> Current OE-core status:
> 	libsdl_1.2.14-r2_armv7a.ipk
> 
> With this commit we get both proper shlib renaming and the -dev package now has all the dev files
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index a28a88a..f587291 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -15,7 +15,7 @@  PROVIDES = "virtual/libsdl"
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
 DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
 
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://configure_tweak.patch \
@@ -26,7 +26,7 @@  S = "${WORKDIR}/SDL-${PV}"
 SRC_URI[md5sum] = "e52086d1b508fa0b76c52ee30b55bec4"
 SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6"
 
-inherit autotools binconfig pkgconfig
+inherit autotools lib_package binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-esd --disable-arts \