diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-21 10:43:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-21 10:43:42 +0200 |
| commit | 4e66a1c1c541a0b60aa63f4d846c5e6f225b71b8 (patch) | |
| tree | db8c1d395ab4a671230a246df665dbee6b62235d /extra/libdrm | |
| parent | 742bd5a396f7a4c474e8ffec0686fc7312603cb8 (diff) | |
| parent | 031887a2047546085998f965214f5b682664de9b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/emacs-nox/PKGBUILD
community/gmic/PKGBUILD
community/libgtksourceviewmm2/PKGBUILD
community/libnewt/PKGBUILD
community/nicotine/PKGBUILD
community/plan9port/PKGBUILD
extra/calligra/PKGBUILD
extra/ilmbase/PKGBUILD
extra/libwps/PKGBUILD
extra/openexr/PKGBUILD
extra/poppler/PKGBUILD
Diffstat (limited to 'extra/libdrm')
| -rw-r--r-- | extra/libdrm/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/libdrm/no-pthread-stubs.patch | 17 |
2 files changed, 23 insertions, 10 deletions
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index ea2a865cc..c1ed6d5f6 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180907 2013-03-27 23:06:26Z andyrtr $ +# $Id: PKGBUILD 183277 2013-04-20 14:43:33Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.43 +pkgver=2.4.44 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,25 +16,21 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) - #git_fixes.diff -sha256sums=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975' - '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' +sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2' + 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { 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-freedreno-experimental-api + --enable-exynos-experimental-api \ + --enable-freedreno-experimental-api make } diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 3b05ce18d..d49e397b7 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -102,3 +102,20 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am libdrm_exynos_la_SOURCES = exynos_drm.c +--- libdrm-2.4.44/freedreno/Makefile.am 2013-04-19 00:59:07.000000000 +0200 ++++ libdrm-2.4.44/freedreno/Makefile.am.new 2013-04-19 17:19:03.153950143 +0200 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/freedreno \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la + 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_LIBADD = ../libdrm.la + + libdrm_freedreno_la_SOURCES = \ + freedreno_device.c \ |