summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndraž Levstik2009-09-15 21:20:59 +0200
committerAndraž Levstik2009-09-15 21:20:59 +0200
commit4fc7c85968402e13c1ad8211d8e5d604fb115cbe (patch)
treeafdc277cbf3ee7ae7dea6ad9c7d98fd138c01a3e
parent648826b030ca79cc17e6e2d8f8d15bf3b9a8c77c (diff)
libdrm: use the separate repo for the -3d support, this is all EXPERIMENTAL and a throw away branch, only here for those that want to test this some
-rwxr-xr-xlibs/libdrm/DETAILS13
-rwxr-xr-xlibs/libdrm/INSTALL10
-rwxr-xr-xlibs/libdrm/PREPARE9
-rwxr-xr-xlibs/libdrm/PRE_BUILD3
4 files changed, 28 insertions, 7 deletions
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index e795da7ff3..2c00e43649 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -1,13 +1,20 @@
SPELL=libdrm
-if [[ $LIBDRM_VCS == y ]]; then
+if [[ $LIBDRM_VCS == y ]] ||
+ [[ $LIBDRM_AGD5F == y ]]; then
if [[ $LIBDRM_VCS_AUTOUPDATE == y ]]; then
VERSION="$(date +%Y%m%d)"
else
VERSION=git
fi
- SOURCE=drm-git.tar.bz2 # Use the same source as drm
- SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/drm:drm-git
+if [[ $LIBDRM_AGD5F == y ]]; then
+ SOURCE_URL=git://anongit.freedesktop.org/~agd5f/drm:drm-agd5f:r6xx-r7xx-3d
+ SOURCE=drm-agd5f.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-agd5f"
+else
+ SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm:drm-git
+ SOURCE=drm-git.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
+fi
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
diff --git a/libs/libdrm/INSTALL b/libs/libdrm/INSTALL
new file mode 100755
index 0000000000..2c449e54d8
--- /dev/null
+++ b/libs/libdrm/INSTALL
@@ -0,0 +1,10 @@
+cd ${SOURCE_DIRECTORY} &&
+make install &&
+if [[ $LIBDRM_LIBS == y ]]; then
+cd ${SOURCE_DIRECTORY}/libdrm/radeon &&
+make install
+fi
+if [[ $LIBDRM_KERNEL == y ]]; then
+cd ${SOURCE_DIRECTORY}/linux-core &&
+make install
+fi
diff --git a/libs/libdrm/PREPARE b/libs/libdrm/PREPARE
index c5f06cc1fd..6f07771f8d 100755
--- a/libs/libdrm/PREPARE
+++ b/libs/libdrm/PREPARE
@@ -1,6 +1,9 @@
-config_query LIBDRM_VCS "Build latest version from development tree?" n &&
-
-if [[ $LIBDRM_VCS == y ]]; then
+config_query LIBDRM_AGD5F "Use the r6xx-r7xx-3d experimental branch?" n &&
+if [[ $LIBDRM_AGD5F != y ]]; then
+config_query LIBDRM_VCS "Build latest version from development tree?" n
+fi &&
+if [[ $LIBDRM_VCS == y ]] ||
+ [[ $LIBDRM_AGD5F == y ]]; then
config_query LIBDRM_VCS_AUTOUPDATE \
"Automatically update on every system update?" n
fi
diff --git a/libs/libdrm/PRE_BUILD b/libs/libdrm/PRE_BUILD
index c1418ac029..728912eb08 100755
--- a/libs/libdrm/PRE_BUILD
+++ b/libs/libdrm/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if [[ $LIBDRM_VCS == y ]]; then
+if [[ $LIBDRM_VCS == y ]] ||
+ [[ $LIBDRM_AGD5F == y ]]; then
autoreconf -v --install
# ./autogen.sh
fi