Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ffba83b4bfb614750efa158e158a5fb7221dd067)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ffba83b4bfb614750efa158e158a5fb7221dd067)
  • Date: Fri, 14 Aug 2015 16:31:53 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/libdrm/BUILD | 13
++++------
libs/libdrm/CONFIGURE | 2 -
libs/libdrm/DETAILS | 4
+--
libs/libdrm/HISTORY | 6
++++
libs/libdrm/INSTALL | 6
----
libs/libdrm/PRE_SUB_DEPENDS | 1
libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS | 6
----
libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS | 6
----
libs/libdrm/SUB_DEPENDS | 3 ++
9 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit ffba83b4bfb614750efa158e158a5fb7221dd067
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdrm: => 2.4.63

diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index 7ce40ce..c057409 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -1,3 +1,8 @@
+if [[ $LIBDRM_AMD == y ]]; then
+ OPTS="--enable-amdgpu $OPTS"
+else
+ OPTS="--disable-amdgpu $OPTS"
+fi &&
if [[ $LIBDRM_NV == y ]]; then
OPTS="--enable-nouveau $OPTS"
else
@@ -13,10 +18,4 @@ if [[ $LIBDRM_RADEON == y ]]; then
else
OPTS="--disable-radeon $OPTS"
fi &&
-
-default_build &&
-
-if [[ $LIBDRM_LIBS == y ]]; then
- cd ${SOURCE_DIRECTORY}/radeon &&
- make
-fi
+default_build
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index 45af6dc..41af049 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,4 +1,4 @@
+config_query LIBDRM_AMD 'Enable amdgpu KMS api?' n
config_query LIBDRM_NV 'Enable nouveau KMS api?' n
config_query LIBDRM_INTEL 'Enable intel KMS api?' n
config_query LIBDRM_RADEON 'Enable radeon KMS api' n
-config_query LIBDRM_LIBS 'Install radeon libs?' n
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index b1c8658..ecc7fcc 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.62
-
SOURCE_HASH=sha512:f7e2ef79c80dd0c3a837970052b7e66110e9b99d3e87b3cd278646bb4cb39832a9562144016a7e956a85212d9251b191279f5ba25d7e8bc0bfbfc1a311df3873
+ VERSION=2.4.63
+
SOURCE_HASH=sha512:91ebb0c0db8b9362bad287ab9ab6394980a876104ded31d36984e9a2e0f7a5bc4b524596b364f2bad6d72d5e8d8b04358da4110c91e0966de2642b520e023996
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 9de3684..21de387 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,9 @@
+2015-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.63
+ * CONFIGURE BUILD PRE_SUB_DEPENDS SUB_DEPENDS: add amdgpu support
+ * BUILD: simplified
+ * INSTALL, REPAIR*: deleted
+
2015-07-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.62
* DEPENDS: add valgrind
diff --git a/libs/libdrm/INSTALL b/libs/libdrm/INSTALL
deleted file mode 100755
index 313dafd..0000000
--- a/libs/libdrm/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-cd ${SOURCE_DIRECTORY} &&
-make install &&
-if [[ $LIBDRM_LIBS == y ]]; then
-cd ${SOURCE_DIRECTORY}/radeon &&
-make install
-fi
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index 10c89b6..75a10ba 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ AMD) [[ "$LIBDRM_AMD" == "y" ]] && return 0 ;;
NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
diff --git
a/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS
b/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS
deleted file mode 100755
index 0e74f8d..0000000
--- a/libs/libdrm/REPAIR^0dfed17a998ba791355dd313c769d868^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
- RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
deleted file mode 100755
index 0e74f8d..0000000
--- a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
- RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
index 5db50df..452aee9 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -1,4 +1,7 @@
case $THIS_SUB_DEPENDS in
+ AMD) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with AMDGPU KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_AMD='y'
+ ;;
NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
LIBDRM_NV='y'
;;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ffba83b4bfb614750efa158e158a5fb7221dd067), Treeve Jelbert, 08/14/2015

Archive powered by MHonArc 2.6.24.

Top of Page