From 833390e533ee997600f37ec87192f05e49e26db3 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Thu, 22 Jul 2010 17:30:49 -0400 Subject: libdrm-poulsbo: Provide libdrm-poulsbo instead of libdrm In order to allow this package to be build alongside the regular libdrm, it was made to export libdrm-poulsbo and its users make to use libdrm-poulsbo instead of libdrm. libva and xserver-psb were make to build against libdrm-poulsbo. While I was in there, I changed a couple of misspellings of COMPATIBLE and removed a bunch of ';patch=1'. Signed-off-by: Jeff Dike --- .../libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch | 36 +++++++++++++++++ .../libdrm-poulsbo/libdrm-poulsbo_2.3.0.bb | 12 +++--- .../libva/libva-0.31.0/libdrm-poulsbo.patch | 26 ++++++++++++ meta-emenlow/packages/libva/libva_0.31.0.bb | 47 +++++++++++----------- .../xorg-xserver/files/libdrm-poulsbo.patch | 26 ++++++++++++ .../packages/xorg-xserver/xserver-psb_1.7.99.2.bb | 11 ++--- 6 files changed, 125 insertions(+), 33 deletions(-) create mode 100644 meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch create mode 100644 meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch create mode 100644 meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch (limited to 'meta-emenlow') 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 new file mode 100644 index 0000000000..e62188a7ac --- /dev/null +++ b/meta-emenlow/packages/libdrm-poulsbo/libdrm-poulsbo-2.3.0/libdrm-poulsbo.patch @@ -0,0 +1,36 @@ +# Make this package produce libdrm-poulsbo instead of libdrm so that the +# emenlow libdrm can coexist with the normal libdrm. +# jdike@linux.intel.com + +Index: libdrm-poulsbo-2.3.0/configure.ac +=================================================================== +--- libdrm-poulsbo-2.3.0.orig/configure.ac ++++ libdrm-poulsbo-2.3.0/configure.ac +@@ -19,7 +19,7 @@ + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + 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_CONFIG_SRCDIR([Makefile.am]) + AM_INIT_AUTOMAKE([dist-bzip2]) + +@@ -35,4 +35,4 @@ AC_SYS_LARGEFILE + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + +-AC_OUTPUT([Makefile libdrm/Makefile shared-core/Makefile libdrm.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 ++++ libdrm-poulsbo-2.3.0/Makefile.am +@@ -25,6 +25,6 @@ AUTOMAKE_OPTIONS = foreign + SUBDIRS = libdrm shared-core + + pkgconfigdir = @pkgconfigdir@ +-pkgconfig_DATA = libdrm.pc ++pkgconfig_DATA = libdrm-poulsbo.pc + +-EXTRA_DIST = libdrm.pc.in ++EXTRA_DIST = libdrm-poulsbo.pc.in 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 8a06dce8cc..3541501e9c 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,14 +1,16 @@ DESCRIPTION = "Userspace interface to kernel DRM services" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7" -PR="r1" +PR="r2" -PROVIDES = "libdrm-poulsbo libdrm drm" +PROVIDES = "libdrm-poulsbo" inherit autotools pkgconfig -SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.0-1ubuntu0sarvatt4~1004um1ubuntu1.tar.gz" +SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libdrm-poulsbo_2.3.0-1ubuntu0sarvatt4~1004um1ubuntu1.tar.gz \ + file://libdrm-poulsbo.patch" -do_install_append() { - cp ${D}/${libdir}/pkgconfig/libdrm.pc ${D}/${libdir}/pkgconfig/libdrm-poulsbo.pc +do_configure_prepend() { + sed -e 's/-ldrm/-ldrm-poulsbo/' -e 's/libdrm/libdrm-poulsbo/' \ + < ${S}/libdrm.pc.in > ${S}/libdrm-poulsbo.pc.in } 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 new file mode 100644 index 0000000000..795ba62522 --- /dev/null +++ b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch @@ -0,0 +1,26 @@ +# Make the libva depend on libdrm-poulsbo instead of libdrm so that the +# emenlow libdrm can coexist with the normal libdrm. +# jdike@linux.intel.com + +Index: libva-0.31.0/configure.ac +=================================================================== +--- libva-0.31.0.orig/configure.ac ++++ libva-0.31.0/configure.ac +@@ -99,14 +99,14 @@ AC_SYS_LARGEFILE + PKG_CHECK_MODULES([X11], [x11]) + PKG_CHECK_MODULES([XEXT],[xext]) + PKG_CHECK_MODULES([XFIXES], [xfixes]) +-PKG_CHECK_MODULES([DRM], [libdrm]) ++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) + + # 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]) + enable_i965_driver=no + fi + AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) diff --git a/meta-emenlow/packages/libva/libva_0.31.0.bb b/meta-emenlow/packages/libva/libva_0.31.0.bb index bd9f758b00..0bc782f9d6 100644 --- a/meta-emenlow/packages/libva/libva_0.31.0.bb +++ b/meta-emenlow/packages/libva/libva_0.31.0.bb @@ -1,32 +1,33 @@ DESCRIPTION = "Video Acceleration (VA) API for Linux" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=efc13a0998e678466e556756613c582e" -PR = "r0" +PR = "r1" inherit autotools SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libva_0.31.0-1+sds9.1ubuntu1.tar.gz \ - file://033_g45_add_rgba_subpic.patch;patch=1 \ - file://034_g45_fix_return_for_unimpl.patch;patch=1 \ - file://035_g45_add_yv12_image_format.patch;patch=1 \ - file://036_g45_add_vaGetImage.patch;patch=1 \ - file://037_g45_add_vaPutImage.patch;patch=1 \ - file://038_g45_vaPutSurface_cliprects.patch;patch=1 \ - file://102_attribute_visibility.patch;patch=1 \ - file://103_fix_vainfo_deps.patch;patch=1 \ - file://104_fix_libva_pkgconfig_deps.patch;patch=1 \ - file://105_dont_search_LIBGL_DRIVERS_PATH.patch;patch=1 \ - file://108_drivers_path.patch;patch=1 \ - file://203_fix_fglrx_detection.patch;patch=1 \ - file://204_check_ATIFGLEXTENSION.patch;patch=1 \ - file://300_sds_version.patch;patch=1 \ - file://301_vdpau_mpeg4.patch;patch=1 \ - file://320_move_vaPutSurface_flags_def.patch;patch=1 \ - file://321_libva_glx.base.patch;patch=1 \ - file://322_libva_glx.patch;patch=1 \ - file://390_compat.base.patch;patch=1 \ - file://391_compat.patch;patch=1 \ - file://392_compat.dso.patch;patch=1" + file://033_g45_add_rgba_subpic.patch \ + file://034_g45_fix_return_for_unimpl.patch \ + file://035_g45_add_yv12_image_format.patch \ + file://036_g45_add_vaGetImage.patch \ + file://037_g45_add_vaPutImage.patch \ + file://038_g45_vaPutSurface_cliprects.patch \ + file://102_attribute_visibility.patch \ + file://103_fix_vainfo_deps.patch \ + file://104_fix_libva_pkgconfig_deps.patch \ + file://105_dont_search_LIBGL_DRIVERS_PATH.patch \ + file://108_drivers_path.patch \ + file://203_fix_fglrx_detection.patch \ + file://204_check_ATIFGLEXTENSION.patch \ + file://300_sds_version.patch \ + file://301_vdpau_mpeg4.patch \ + file://320_move_vaPutSurface_flags_def.patch \ + file://321_libva_glx.base.patch \ + file://322_libva_glx.patch \ + file://390_compat.base.patch \ + file://391_compat.patch \ + file://392_compat.dso.patch \ + file://libdrm-poulsbo.patch" export LDFLAGS="-Wl,-z,defs" @@ -34,5 +35,5 @@ EXTRA_OECONF = "--disable-i965-driver" FILES_${PN} += "${libdir}/va/drivers/*" -COMAPTIBLE_MACHINE = "emenlow" +COMPATIBLE_MACHINE = "emenlow" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch new file mode 100644 index 0000000000..2f036f1baa --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch @@ -0,0 +1,26 @@ +# Make the server depend on libdrm-poulsbo instead of libdrm so that the +# emenlow libdrm can coexist with the normal libdrm. +# jdike@linux.intel.com + +Index: xorg-server-1.7.99.2/configure.ac +=================================================================== +--- xorg-server-1.7.99.2.orig/configure.ac ++++ xorg-server-1.7.99.2/configure.ac +@@ -763,7 +763,7 @@ dnl List of libraries that require a spe + LIBAPPLEWM="applewm >= 1.4" + LIBDMX="dmx >= 1.0.99.1" + LIBDRI="dri >= 7.1.0" +-LIBDRM="libdrm >= 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" +@@ -2002,7 +2002,7 @@ if test "$KDRIVE" = yes; then + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" + 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" + fi + + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) diff --git a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb index a732f089f9..60906919ca 100644 --- a/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb +++ b/meta-emenlow/packages/xorg-xserver/xserver-psb_1.7.99.2.bb @@ -1,19 +1,20 @@ require ../meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc -PR = "r1" +PR = "r2" PROTO_DEPS += "xf86driproto dri2proto" DEPENDS += "font-util" -SRC_URI += "file://nodolt.patch;patch=1 \ - file://crosscompile.patch;patch=1" +SRC_URI += "file://nodolt.patch \ + file://crosscompile.patch \ + file://libdrm-poulsbo.patch" # Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" +SRC_URI += "file://fix_open_max_preprocessor_error.patch" EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga --enable-glx" DEPENDS += "psb-firmware xpsb-glx psb-kernel-source libdrm-poulsbo libva" -COMPATBILE_MACHINE = "emenlow" +COMPATIBLE_MACHINE = "emenlow" -- cgit v1.2.3-54-g00ecf