sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

emenlow: Change libdrm-poulsbo to libdrm_poulsbo 

It turns out to be a lot easier to generate library names with
underscores than with dashes.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
This commit is contained in:
Jeff Dike 2010-07-23 20:57:12 -04:00 committed by Richard Purdie
parent 17326346ff
commit c28cbe7fed
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch vendored
View File

@ -11,7 +11,7 @@ Index: libdrm-poulsbo-2.3.0/configure.ac
AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm-poulsbo], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm-poulsbo)
+AC_INIT([libdrm_poulsbo], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm_poulsbo)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
@ -20,7 +20,7 @@ Index: libdrm-poulsbo-2.3.0/configure.ac
AC_SUBST(pkgconfigdir)
-AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc])
+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm-poulsbo.pc])
+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm_poulsbo.pc])
Index: libdrm-poulsbo-2.3.0/Makefile.am
===================================================================
--- libdrm-poulsbo-2.3.0.orig/Makefile.am
@ -30,7 +30,32 @@ Index: libdrm-poulsbo-2.3.0/Makefile.am
pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libdrm.pc
+pkgconfig_DATA = libdrm-poulsbo.pc
+pkgconfig_DATA = libdrm_poulsbo.pc
-EXTRA_DIST = libdrm.pc.in
+EXTRA_DIST = libdrm-poulsbo.pc.in
+EXTRA_DIST = libdrm_poulsbo.pc.in
Index: libdrm-poulsbo-2.3.0/libdrm/Makefile.am
===================================================================
--- libdrm-poulsbo-2.3.0.orig/libdrm/Makefile.am
+++ libdrm-poulsbo-2.3.0/libdrm/Makefile.am
@@ -18,14 +18,14 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-libdrm_la_LTLIBRARIES = libdrm.la
-libdrm_ladir = $(libdir)
-libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined
+libdrm_poulsbo_la_LTLIBRARIES = libdrm_poulsbo.la
+libdrm_poulsbo_ladir = $(libdir)
+libdrm_poulsbo_la_LDFLAGS = -version-number 2:3:0 -no-undefined
AM_CFLAGS = -I$(top_srcdir)/shared-core
-libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c
+libdrm_poulsbo_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c
-libdrmincludedir = ${includedir}/psb
-libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h
+libdrm_poulsboincludedir = ${includedir}/psb
+libdrm_poulsboinclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h
EXTRA_DIST = ChangeLog TODO

4
meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "Userspace interface to kernel DRM services"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7"
PR="r2"
PR="r3"
PROVIDES = "libdrm-poulsbo"
@ -12,5 +12,5 @@ SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.
do_configure_prepend() {
sed -e 's/-ldrm/-ldrm-poulsbo/' -e 's/libdrm/libdrm-poulsbo/' \
< ${S}/libdrm.pc.in > ${S}/libdrm-poulsbo.pc.in
< ${S}/libdrm.pc.in > ${S}/libdrm_poulsbo.pc.in
}

6
meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch vendored
View File

@ -11,7 +11,7 @@ Index: libva-0.31.0/configure.ac
PKG_CHECK_MODULES([XEXT],[xext])
PKG_CHECK_MODULES([XFIXES], [xfixes])
-PKG_CHECK_MODULES([DRM], [libdrm])
+PKG_CHECK_MODULES([DRM], [libdrm-poulsbo])
+PKG_CHECK_MODULES([DRM], [libdrm_poulsbo])
PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
@ -19,8 +19,8 @@ Index: libva-0.31.0/configure.ac
# Check for libdrm >= 2.4 (needed for i965_drv_video.so)
-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then
- AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver])
+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm-poulsbo; then
+ AC_MSG_WARN([libdrm-poulsbo < 2.4 found, disabling build of i965 video driver])
+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm_poulsbo; then
+ AC_MSG_WARN([libdrm_poulsbo < 2.4 found, disabling build of i965 video driver])
enable_i965_driver=no
fi
AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)

4
meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch
View File

@ -11,7 +11,7 @@ Index: xorg-server-1.7.99.2/configure.ac
LIBDMX="dmx >= 1.0.99.1"
LIBDRI="dri >= 7.1.0"
-LIBDRM="libdrm >= 2.3.0"
+LIBDRM="libdrm-poulsbo >= 2.3.0"
+LIBDRM="libdrm_poulsbo >= 2.3.0"
LIBGL="gl >= 7.1.0"
LIBXEXT="xext >= 1.0.99.4"
LIBXI="xi >= 1.2.99.1"
@ -20,7 +20,7 @@ Index: xorg-server-1.7.99.2/configure.ac
fi
if test "x$DRI" = xyes && test "x$GLX" = xyes; then
- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm-poulsbo"
+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm_poulsbo"
fi
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])