Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0caed93421e0f1f11ec628af2017d35a0ec7d2ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (0caed93421e0f1f11ec628af2017d35a0ec7d2ee)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0caed93421e0f1f11ec628af2017d35a0ec7d2ee)
  • Date: Sun, 22 Mar 2015 05:48:26 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics-libs/libva-intel-driver/BUILD | 2 ++
graphics-libs/libva-intel-driver/CONFIGURE | 19 +++++++++++++++++++
graphics-libs/libva-intel-driver/DEPENDS | 2 +-
graphics-libs/libva-intel-driver/DETAILS | 4 ++--
graphics-libs/libva-intel-driver/HISTORY | 5 +++++
graphics-libs/libva-intel-driver/PRE_BUILD | 3 ++-
graphics-libs/mesalib/BUILD | 6 ++++++
graphics-libs/mesalib/DEPENDS | 10 +++++-----
graphics-libs/mesalib/HISTORY | 5 +++++
libs/libva/HISTORY | 5 +++++
libs/libva/PRE_BUILD | 5 -----
libs/libva/PRE_SUB_DEPENDS | 6 ++++++
libs/libva/REPAIR^all^PRE_SUB_DEPENDS | 6 ++++++
libs/libva/SUB_DEPENDS | 15 +++++++++++++++
14 files changed, 79 insertions(+), 14 deletions(-)

New commits:
commit 0caed93421e0f1f11ec628af2017d35a0ec7d2ee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mesalib: fix syntax (quotes for list_find)

commit 6115ccab977edd4a8346813e3bd4a693396a575f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libva-intel-driver: bump to 1.5.1 and fixup with sub dependencies on libva

commit cdff1fab89cd2a370eac04ee950f1cbd75fd392b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libva: add sub dependencies, use upstream configure script again

commit 916490e02f1ee7b9639f03cc0b2426a8c30f1742
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mesalib: add flags to find new libelf header directory

diff --git a/graphics-libs/libva-intel-driver/BUILD
b/graphics-libs/libva-intel-driver/BUILD
new file mode 100755
index 0000000..8d2fecf
--- /dev/null
+++ b/graphics-libs/libva-intel-driver/BUILD
@@ -0,0 +1,2 @@
+OPTS="$LIBVA_INTEL_API_OPTS $OPTS" &&
+default_build
diff --git a/graphics-libs/libva-intel-driver/CONFIGURE
b/graphics-libs/libva-intel-driver/CONFIGURE
new file mode 100755
index 0000000..80ed11b
--- /dev/null
+++ b/graphics-libs/libva-intel-driver/CONFIGURE
@@ -0,0 +1,19 @@
+# Upstream has all enabled by default.
+config_query_option LIBVA_INTEL_API_OPTS "Enable DRM API?" y \
+ --enable-drm --disable-drm &&
+config_query_option LIBVA_INTEL_API_OPTS "Enable X11 API?" y \
+ --enable-x11 --disable-x11 &&
+config_query_option LIBVA_INTEL_API_OPTS "Enable wayland API?" y \
+ --enable-wayland --disable-wayland &&
+
+# Need to store the selection for sub dependency to libva.
+persistent_add LIBVA_INTEL_API
+if list_find "$LIBVA_INTEL_API_OPTS" --enable-drm; then
+ LIBVA_INTEL_API+=" DRM"
+fi &&
+if list_find "$LIBVA_INTEL_API_OPTS" --enable-x11; then
+ LIBVA_INTEL_API+=" X11"
+fi &&
+if list_find "$LIBVA_INTEL_API_OPTS" --enable-wayland; then
+ LIBVA_INTEL_API+=" WAYLAND"
+fi
diff --git a/graphics-libs/libva-intel-driver/DEPENDS
b/graphics-libs/libva-intel-driver/DEPENDS
index 6b05948..1f148ad 100755
--- a/graphics-libs/libva-intel-driver/DEPENDS
+++ b/graphics-libs/libva-intel-driver/DEPENDS
@@ -1 +1 @@
-depends libva
+depends -sub "$LIBVA_INTEL_API" libva
diff --git a/graphics-libs/libva-intel-driver/DETAILS
b/graphics-libs/libva-intel-driver/DETAILS
index beaa4e0..62f2bd9 100755
--- a/graphics-libs/libva-intel-driver/DETAILS
+++ b/graphics-libs/libva-intel-driver/DETAILS
@@ -1,8 +1,8 @@
SPELL=libva-intel-driver
- VERSION=1.3.2
+ VERSION=1.5.1
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://www.freedesktop.org/software/vaapi/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:94b09a64cbc2186b2c2cb863fbc8b390314e2b91bdf05b756d5d83a707db3847cca72072bb79bb09e69e335a711343f809552bc02b229679f8f5bb2b85602e1c
+
SOURCE_HASH=sha512:cb1298ffffbf43a42fca3a030ed2baecdb30468c8d2a8b1e5f2bb2849c3ce9956cb21a5da0a6482a2fba1b8a09358363237f8325e48d184e4ad49557546e7e25
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://cgit.freedesktop.org/vaapi/intel-driver";
LICENSE[0]=MIT
diff --git a/graphics-libs/libva-intel-driver/HISTORY
b/graphics-libs/libva-intel-driver/HISTORY
index bf1af47..f90d2ca 100644
--- a/graphics-libs/libva-intel-driver/HISTORY
+++ b/graphics-libs/libva-intel-driver/HISTORY
@@ -1,3 +1,8 @@
+2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.5.1
+ * PRE_BUILD: still needed, what a disappointment
+ * DEPENDS, CONFIGURE, BUILD: dance for various sub-depends on libva
+
2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.3.2
* PRE_BUILD: fixup b0rked configure (enable wayland-less build)
diff --git a/graphics-libs/libva-intel-driver/PRE_BUILD
b/graphics-libs/libva-intel-driver/PRE_BUILD
index ad14830..0815787 100755
--- a/graphics-libs/libva-intel-driver/PRE_BUILD
+++ b/graphics-libs/libva-intel-driver/PRE_BUILD
@@ -1,5 +1,6 @@
# libva-intel-driver-1.3.2: now shipping with badly generated configure
script!
+# Still needed for 1.5.1!
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-autoreconf -f
+autoreconf -iv

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index aa52e67..8031089 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -2,6 +2,12 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=70471
# llvm-config output should contain -fno-rtti.
CXXFLAGS+=" -fno-rtti" &&
+# Doesn't know where to look for libelf headers, yet.
+if is_depends_enabled $SPELL libelf; then
+ elfflags=$(pkg-config --cflags libelf)
+ CFLAGS+=" $elfflags"
+ CXXFLAGS+=" $elfflags"
+fi &&
OPTS="--with-dri-drivers=${MESALIB_DRIVERS// /,} \
--with-gallium-drivers=${MESALIB_GALLIUM// /,} \
$MESALIB_OPTS \
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 7a4d195..877a693 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -46,17 +46,17 @@ if [[ "$MESALIB_GALLIUM" != "none" ]]; then
fi
fi &&

-if ( list_find $MESALIB_DRIVERS i915 ) || \
- ( list_find $MESALIB_DRIVERS i965); then
+if ( list_find "$MESALIB_DRIVERS" i915 ) || \
+ ( list_find "$MESALIB_DRIVERS" i965); then
sub_depends libdrm INTEL
fi &&

-if ( list_find $MESALIB_DRIVERS r200) || \
- ( list_find $MESALIB_DRIVERS radeon); then
+if ( list_find "$MESALIB_DRIVERS" r200) || \
+ ( list_find "$MESALIB_DRIVERS" radeon); then
sub_depends libdrm RADEON
fi &&

-if ( list_find $MESALIB_DRIVERS nouveau); then
+if ( list_find "$MESALIB_DRIVERS" nouveau); then
sub_depends libdrm NOUVEAU
fi &&

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 3a68ef3..d134a70 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: hack for finding moved libelf headers
+ (--enable-compat in libelf build being another possibility)
+ * DEPENDS: quote lists in list_find
+
2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
* UP_TRIGGERS: Use plain grep, not grep -P. This is an optional
feature.

diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index e526076..0924dae 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,3 +1,8 @@
+2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS:
+ Trying to get dependency situation clear for libva drivers.
+ * PRE_BUILD: hopefully gone for good
+
2015-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0

diff --git a/libs/libva/PRE_BUILD b/libs/libva/PRE_BUILD
deleted file mode 100755
index 136b3f1..0000000
--- a/libs/libva/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-# libva-1.3.1: now shipping with badly generated configure script!
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-autoreconf -f
-
diff --git a/libs/libva/PRE_SUB_DEPENDS b/libs/libva/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..72cae9c
--- /dev/null
+++ b/libs/libva/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DRM) is_depends_enabled $SPELL libdrm && return 0 ;;
+ X11) is_depends_enabled $SPELL libx11 && return 0 ;;
+ WAYLAND) is_depends_enabled $SPELL wayland && return 0 ;;
+esac
+return 1
diff --git a/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
b/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..72cae9c
--- /dev/null
+++ b/libs/libva/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DRM) is_depends_enabled $SPELL libdrm && return 0 ;;
+ X11) is_depends_enabled $SPELL libx11 && return 0 ;;
+ WAYLAND) is_depends_enabled $SPELL wayland && return 0 ;;
+esac
+return 1
diff --git a/libs/libva/SUB_DEPENDS b/libs/libva/SUB_DEPENDS
new file mode 100755
index 0000000..a289797
--- /dev/null
+++ b/libs/libva/SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+ DRM) message "${MESSAGE_COLOR}DRM support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends libdrm "--enable-drm"
+ ;;
+ X11) message "${MESSAGE_COLOR}X11 support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends libx11 "--enable-x11" &&
+ depends libxfixes &&
+ depends libxext
+ ;;
+ WAYLAND) message "${MESSAGE_COLOR}Wayland support requested, enforcing
it.$DEFAULT_COLOR" &&
+ depends wayland "--enable-wayland"
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0caed93421e0f1f11ec628af2017d35a0ec7d2ee), Thomas Orgis, 03/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page