Date: Thursday, March 28, 2013 @ 00:05:55 Author: andyrtr Revision: 180906
upgpkg: libdrm 2.4.43-1 upstream update 2.4.43; disable exynos and freedreno that are broken and won't build due to missing headers Added: libdrm/trunk/git_fixes.diff Modified: libdrm/trunk/PKGBUILD Deleted: libdrm/trunk/buildfix.diff ----------------+ PKGBUILD | 11 ++++++++--- buildfix.diff | 11 ----------- git_fixes.diff | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-27 21:58:17 UTC (rev 180905) +++ PKGBUILD 2013-03-27 23:05:55 UTC (rev 180906) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=libdrm -pkgver=2.4.42 +pkgver=2.4.43 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -15,7 +15,8 @@ source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1' + #git_fixes.diff +sha256sums=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975' '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') @@ -23,12 +24,16 @@ cd $pkgname-$pkgver patch -Np1 -i ../no-pthread-stubs.patch + # git_commits + #patch -Np1 -i ${srcdir}/git_fixes.diff + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ --enable-omap-experimental-api \ - --enable-exynos-experimental-api + # --enable-exynos-experimental-api \ + # --enable-freedreno-experimental-api make } Deleted: buildfix.diff =================================================================== --- buildfix.diff 2013-03-27 21:58:17 UTC (rev 180905) +++ buildfix.diff 2013-03-27 23:05:55 UTC (rev 180906) @@ -1,11 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 10cc9a4..1776610 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,6 @@ AC_CONFIG_FILES([ - tests/vbltest/Makefile - include/Makefile - include/drm/Makefile -- man/Makefile - libdrm.pc]) - AC_OUTPUT Added: git_fixes.diff =================================================================== --- git_fixes.diff (rev 0) +++ git_fixes.diff 2013-03-27 23:05:55 UTC (rev 180906) @@ -0,0 +1,49 @@ +From 99105e765c31b598746b849e66e7a9106dcefa24 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst <maarten.lankho...@canonical.com> +Date: Wed, 27 Mar 2013 13:06:43 +0000 +Subject: makefiles: Add missing headers. + +I even compile time tested this on a panda with make dist! + +Signed-off-by: Maarten Lankhorst <maarten.lankho...@canonical.com> +--- +diff --git a/exynos/Makefile.am b/exynos/Makefile.am +index 539aea0..0a2663a 100644 +--- a/exynos/Makefile.am ++++ b/exynos/Makefile.am +@@ -10,7 +10,11 @@ libdrm_exynos_ladir = $(libdir) + libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined + libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + +-libdrm_exynos_la_SOURCES = exynos_drm.c exynos_fimg2d.c ++libdrm_exynos_la_SOURCES = \ ++ exynos_drm.c \ ++ exynos_fimg2d.c \ ++ fimg2d.h \ ++ fimg2d_reg.h + + libdrm_exynoscommonincludedir = ${includedir}/exynos + libdrm_exynoscommoninclude_HEADERS = exynos_drm.h +diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am +index f46a780..ba9bd68 100644 +--- a/freedreno/Makefile.am ++++ b/freedreno/Makefile.am +@@ -10,7 +10,15 @@ libdrm_freedreno_ladir = $(libdir) + libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined + libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ + +-libdrm_freedreno_la_SOURCES = freedreno_device.c freedreno_pipe.c freedreno_ringbuffer.c freedreno_bo.c ++libdrm_freedreno_la_SOURCES = \ ++ freedreno_device.c \ ++ freedreno_pipe.c \ ++ freedreno_priv.h \ ++ freedreno_ringbuffer.c \ ++ freedreno_bo.c \ ++ kgsl_drm.h \ ++ list.h \ ++ msm_kgsl.h + + libdrm_freedrenocommonincludedir = ${includedir}/freedreno + libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h +-- +cgit v0.9.0.2-2-gbebe
