[Archvdr-devel] SF.net SVN: archvdr:[1162] trunk/archvdr
Brought to you by:
huceke
Menu
▾
▴
[Archvdr-devel] SF.net SVN: archvdr:[1162] trunk/archvdr
|
From: <hu...@us...> - 2010-05-18 07:30:44
|
Revision: 1162
http://archvdr.svn.sourceforge.net/archvdr/?rev=1162&view=rev
Author: huceke
Date: 2010-05-18 07:30:37 +0000 (Tue, 18 May 2010)
Log Message:
-----------
udpate.
Modified Paths:
--------------
trunk/archvdr/xf86-video-intel-git/PKGBUILD
Added Paths:
-----------
trunk/archvdr/libdrm-git/
trunk/archvdr/libdrm-git/COPYING
trunk/archvdr/libdrm-git/PKGBUILD
trunk/archvdr/libdrm-git/no-pthread-stubs.patch
Added: trunk/archvdr/libdrm-git/COPYING
===================================================================
--- trunk/archvdr/libdrm-git/COPYING (rev 0)
+++ trunk/archvdr/libdrm-git/COPYING 2010-05-18 07:30:37 UTC (rev 1162)
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 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.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER 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.
Added: trunk/archvdr/libdrm-git/PKGBUILD
===================================================================
--- trunk/archvdr/libdrm-git/PKGBUILD (rev 0)
+++ trunk/archvdr/libdrm-git/PKGBUILD 2010-05-18 07:30:37 UTC (rev 1162)
@@ -0,0 +1,59 @@
+#Contributor: Antti "Tera" Oja <ant...@gm...>
+
+pkgname=libdrm-git
+pkgver=20100518
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=('i686' 'x86_64')
+url="http://dri.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('git')
+provides=('libdrm=2.4.19' 'libdrm-git')
+conflicts=('libdrm')
+source=('no-pthread-stubs.patch'
+ 'COPYING')
+options=('!libtool')
+
+md5sums=('9b5ec3bbebe86921e2057694c42f65b8'
+ 'ba65e71c481b94ef0fb6c23c7f21ffa1')
+
+_gitroot="git://git.freedesktop.org/git/mesa/drm"
+_gitname="drm"
+
+build() {
+ cd ${srcdir}
+ msg "Connecting to git.freedesktop.org GIT server...."
+
+ if [ -d $_gitname ] ; then
+ cd $_gitname && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_gitroot
+ fi
+
+ msg "GIT checkout done or server timeout"
+
+ msg "Creating build directory"
+ if [ -d "${srcdir}/$_gitname-build" ]; then rm -rf "${srcdir}/$_gitname-build"; fi
+ cp -R "${srcdir}/$_gitname" "${srcdir}/$_gitname-build"
+
+ msg "Starting make..."
+ cd ${srcdir}/$_gitname-build
+
+ msg "Applying patches ..."
+ patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1
+
+ sh autogen.sh --prefix=/usr \
+ --enable-nouveau-experimental-api \
+ --enable-radeon \
+ --enable-udev || return 1
+
+ make || return 1
+ make DESTDIR=${pkgdir} install || return 1
+
+ # Install license file
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+
+}
Added: trunk/archvdr/libdrm-git/no-pthread-stubs.patch
===================================================================
--- trunk/archvdr/libdrm-git/no-pthread-stubs.patch (rev 0)
+++ trunk/archvdr/libdrm-git/no-pthread-stubs.patch 2010-05-18 07:30:37 UTC (rev 1162)
@@ -0,0 +1,65 @@
+diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
+--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
++++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
+@@ -32,10 +32,6 @@
+ AC_HEADER_STDC
+ AC_SYS_LARGEFILE
+
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev],
+--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
+@@ -26,13 +26,12 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/intel \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+ libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
+ libdrm_intel_ladir = $(libdir)
+ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
++libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
+
+ libdrm_intel_la_SOURCES = \
+ intel_atomic.h \
+--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
+@@ -26,13 +26,12 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/radeon \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+ libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
+ libdrm_radeon_ladir = $(libdir)
+ libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_radeon_la_LIBADD = ../libdrm.la
+
+ libdrm_radeon_la_SOURCES = \
+ radeon_bo_gem.c \
+--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
+@@ -2,13 +2,12 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/nouveau \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+
+ libdrm_nouveau_la_SOURCES = \
+ nouveau_device.c \
Modified: trunk/archvdr/xf86-video-intel-git/PKGBUILD
===================================================================
--- trunk/archvdr/xf86-video-intel-git/PKGBUILD 2010-05-17 16:58:17 UTC (rev 1161)
+++ trunk/archvdr/xf86-video-intel-git/PKGBUILD 2010-05-18 07:30:37 UTC (rev 1162)
@@ -4,12 +4,11 @@
pkgname=xf86-video-intel-git
pkgver=2.11.0
pkgrel=1
-gitid=5e04a81369dfc76bbc1ebbd4db00c23e71eb9e1c
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('intel-dri>=7.6' 'libpciaccess>=0.10.8' 'libdrm>=2.4.15' 'libxvmc>=1.0.5')
+depends=('intel-dri>=7.6' 'libpciaccess>=0.10.8' 'libdrm-git' 'libxvmc>=1.0.5')
makedepends=('pkgconfig' 'xorg-server>=1.7.0' 'xf86driproto>=2.1.0' 'glproto>=1.4.10' 'mesa>=7.6' 'xineramaproto>=1.2' 'inputproto' 'xorg-util-macros')
conflicts=('xorg-server<1.7.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
@@ -18,20 +17,22 @@
md5sums=('b924480931774dec14515e270db4924d')
conflicts=('xf86-video-intel')
+_githost="git://anongit.freedesktop.org/xorg/driver"
+_gitrepo="xf86-video-intel"
+#gitid=5e04a81369dfc76bbc1ebbd4db00c23e71eb9e1c
+
build() {
cd "$srcdir/" || return 1
-
- _githost="git://anongit.freedesktop.org/xorg/driver"
- _gitrepo="xf86-video-intel"
if [ -e $srcdir/${_gitrepo} ]; then
cd $srcdir/${_gitrepo}
- git pull
- git checkout $gitid
+ #git pull
+ #git checkout $gitid
+ git pull origin
else
git clone ${_githost}/${_gitrepo}
cd $srcdir/${_gitrepo}
- git checkout $gitid
+ #git checkout $gitid
fi
[ -e $srcdir/${_gitrepo}-build ]; rm -rf $srcdir/${_gitrepo}-build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
