summaryrefslogtreecommitdiffstats
path: root/meta-emenlow/packages
diff options
context:
space:
mode:
authorJeff Dike <jdike@x86_64.user-mode-linux.org>2010-07-23 20:57:12 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-24 02:01:59 +0100
commitc28cbe7fed0ea2d8e1889ac8fc8024487310abbb (patch)
treeb6bb1e66d48f2727fa6a4725a3b2cb1a02d0afb5 /meta-emenlow/packages
parent17326346ffebe3f5e175b84de36e8050de1a4b06 (diff)
downloadpoky-c28cbe7fed0ea2d8e1889ac8fc8024487310abbb.tar.gz
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>
Diffstat (limited to 'meta-emenlow/packages')
-rw-r--r--meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch33
-rw-r--r--meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb4
-rw-r--r--meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch6
-rw-r--r--meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch4
4 files changed, 36 insertions, 11 deletions
diff --git a/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch b/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch
index e62188a7ac..14bde6887a 100644
--- a/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch
+++ b/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch
@@ -11,7 +11,7 @@ Index: libdrm-poulsbo-2.3.0/configure.ac
11 11
12 AC_PREREQ(2.57) 12 AC_PREREQ(2.57)
13-AC_INIT([libdrm], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm) 13-AC_INIT([libdrm], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm)
14+AC_INIT([libdrm-poulsbo], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm-poulsbo) 14+AC_INIT([libdrm_poulsbo], 2.3.1, [dri-devel@lists.sourceforge.net], libdrm_poulsbo)
15 AC_CONFIG_SRCDIR([Makefile.am]) 15 AC_CONFIG_SRCDIR([Makefile.am])
16 AM_INIT_AUTOMAKE([dist-bzip2]) 16 AM_INIT_AUTOMAKE([dist-bzip2])
17 17
@@ -20,7 +20,7 @@ Index: libdrm-poulsbo-2.3.0/configure.ac
20 AC_SUBST(pkgconfigdir) 20 AC_SUBST(pkgconfigdir)
21 21
22-AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc]) 22-AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.pc])
23+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm-poulsbo.pc]) 23+AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm_poulsbo.pc])
24Index: libdrm-poulsbo-2.3.0/Makefile.am 24Index: libdrm-poulsbo-2.3.0/Makefile.am
25=================================================================== 25===================================================================
26--- libdrm-poulsbo-2.3.0.orig/Makefile.am 26--- libdrm-poulsbo-2.3.0.orig/Makefile.am
@@ -30,7 +30,32 @@ Index: libdrm-poulsbo-2.3.0/Makefile.am
30 30
31 pkgconfigdir = @pkgconfigdir@ 31 pkgconfigdir = @pkgconfigdir@
32-pkgconfig_DATA = libdrm.pc 32-pkgconfig_DATA = libdrm.pc
33+pkgconfig_DATA = libdrm-poulsbo.pc 33+pkgconfig_DATA = libdrm_poulsbo.pc
34 34
35-EXTRA_DIST = libdrm.pc.in 35-EXTRA_DIST = libdrm.pc.in
36+EXTRA_DIST = libdrm-poulsbo.pc.in 36+EXTRA_DIST = libdrm_poulsbo.pc.in
37Index: libdrm-poulsbo-2.3.0/libdrm/Makefile.am
38===================================================================
39--- libdrm-poulsbo-2.3.0.orig/libdrm/Makefile.am
40+++ libdrm-poulsbo-2.3.0/libdrm/Makefile.am
41@@ -18,14 +18,14 @@
42 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
43 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
44
45-libdrm_la_LTLIBRARIES = libdrm.la
46-libdrm_ladir = $(libdir)
47-libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined
48+libdrm_poulsbo_la_LTLIBRARIES = libdrm_poulsbo.la
49+libdrm_poulsbo_ladir = $(libdir)
50+libdrm_poulsbo_la_LDFLAGS = -version-number 2:3:0 -no-undefined
51
52 AM_CFLAGS = -I$(top_srcdir)/shared-core
53-libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c
54+libdrm_poulsbo_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c
55
56-libdrmincludedir = ${includedir}/psb
57-libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h
58+libdrm_poulsboincludedir = ${includedir}/psb
59+libdrm_poulsboinclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h
60
61 EXTRA_DIST = ChangeLog TODO
diff --git a/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb b/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb
index 3541501e9c..ecbf4ba22a 100644
--- a/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb
+++ b/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Userspace interface to kernel DRM services" 1DESCRIPTION = "Userspace interface to kernel DRM services"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" 3LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7"
4PR="r2" 4PR="r3"
5 5
6PROVIDES = "libdrm-poulsbo" 6PROVIDES = "libdrm-poulsbo"
7 7
@@ -12,5 +12,5 @@ SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.
12 12
13do_configure_prepend() { 13do_configure_prepend() {
14 sed -e 's/-ldrm/-ldrm-poulsbo/' -e 's/libdrm/libdrm-poulsbo/' \ 14 sed -e 's/-ldrm/-ldrm-poulsbo/' -e 's/libdrm/libdrm-poulsbo/' \
15 < ${S}/libdrm.pc.in > ${S}/libdrm-poulsbo.pc.in 15 < ${S}/libdrm.pc.in > ${S}/libdrm_poulsbo.pc.in
16} 16}
diff --git a/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch
index 795ba62522..ac38eceb81 100644
--- a/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch
+++ b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch
@@ -11,7 +11,7 @@ Index: libva-0.31.0/configure.ac
11 PKG_CHECK_MODULES([XEXT],[xext]) 11 PKG_CHECK_MODULES([XEXT],[xext])
12 PKG_CHECK_MODULES([XFIXES], [xfixes]) 12 PKG_CHECK_MODULES([XFIXES], [xfixes])
13-PKG_CHECK_MODULES([DRM], [libdrm]) 13-PKG_CHECK_MODULES([DRM], [libdrm])
14+PKG_CHECK_MODULES([DRM], [libdrm-poulsbo]) 14+PKG_CHECK_MODULES([DRM], [libdrm_poulsbo])
15 15
16 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no]) 16 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
17 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) 17 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
@@ -19,8 +19,8 @@ Index: libva-0.31.0/configure.ac
19 # Check for libdrm >= 2.4 (needed for i965_drv_video.so) 19 # Check for libdrm >= 2.4 (needed for i965_drv_video.so)
20-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then 20-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then
21- AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver]) 21- AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver])
22+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm-poulsbo; then 22+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm_poulsbo; then
23+ AC_MSG_WARN([libdrm-poulsbo < 2.4 found, disabling build of i965 video driver]) 23+ AC_MSG_WARN([libdrm_poulsbo < 2.4 found, disabling build of i965 video driver])
24 enable_i965_driver=no 24 enable_i965_driver=no
25 fi 25 fi
26 AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) 26 AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
diff --git a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch
index 2f036f1baa..b604cab7c2 100644
--- a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch
+++ b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch
@@ -11,7 +11,7 @@ Index: xorg-server-1.7.99.2/configure.ac
11 LIBDMX="dmx >= 1.0.99.1" 11 LIBDMX="dmx >= 1.0.99.1"
12 LIBDRI="dri >= 7.1.0" 12 LIBDRI="dri >= 7.1.0"
13-LIBDRM="libdrm >= 2.3.0" 13-LIBDRM="libdrm >= 2.3.0"
14+LIBDRM="libdrm-poulsbo >= 2.3.0" 14+LIBDRM="libdrm_poulsbo >= 2.3.0"
15 LIBGL="gl >= 7.1.0" 15 LIBGL="gl >= 7.1.0"
16 LIBXEXT="xext >= 1.0.99.4" 16 LIBXEXT="xext >= 1.0.99.4"
17 LIBXI="xi >= 1.2.99.1" 17 LIBXI="xi >= 1.2.99.1"
@@ -20,7 +20,7 @@ Index: xorg-server-1.7.99.2/configure.ac
20 fi 20 fi
21 if test "x$DRI" = xyes && test "x$GLX" = xyes; then 21 if test "x$DRI" = xyes && test "x$GLX" = xyes; then
22- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" 22- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
23+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm-poulsbo" 23+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm_poulsbo"
24 fi 24 fi
25 25
26 PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) 26 PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])