Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Thomas Orgis (b3a5a74c8fb3028e4d5ec23dd01620aa06794a92)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Thomas Orgis (b3a5a74c8fb3028e4d5ec23dd01620aa06794a92)
  • Date: Sun, 24 Aug 2014 08:51:55 -0500

GIT changes to devel-xorg-modular grimoire by Thomas Orgis
<sobukus AT sourcemage.org>:

dev/null |binary
graphics-libs/mesalib-1x/BUILD | 24
++++------------
graphics-libs/mesalib-1x/CONFIGURE | 13 +++++++-
graphics-libs/mesalib-1x/DETAILS | 4 +-
graphics-libs/mesalib-1x/HISTORY | 11 +++++++
graphics-libs/mesalib-1x/PRE_BUILD | 3 ++
graphics-libs/mesalib-1x/PRE_BUILD.orig | 5 +++
graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch | 12 ++++++++
xorg-driver/xf86-video-mga/DETAILS | 6 ++--
xorg-driver/xf86-video-mga/HISTORY | 3 ++
xorg-driver/xf86-video-nouveau/HISTORY | 4 ++
xorg-driver/xf86-video-nouveau/PRE_BUILD | 4 ++
xorg-driver/xf86-video-nv/DETAILS | 6 ++--
xorg-driver/xf86-video-nv/HISTORY | 4 ++
xorg-driver/xf86-video-nv/PRE_BUILD | 4 ++
15 files changed, 75 insertions(+), 28 deletions(-)

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

xf86-video-mga: bump to 1.6.3

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

nouveau: build fix for autogen hack

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

xf86-video-nv: x-bit

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

nv: bump to 2.1.20, build fix

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

mesalib-1x: make it build (including Gallium drivers)

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

mesalib-1x: bump to 10.2.6

diff --git a/graphics-libs/mesalib-1x/BUILD b/graphics-libs/mesalib-1x/BUILD
index f99499e..aa52e67 100755
--- a/graphics-libs/mesalib-1x/BUILD
+++ b/graphics-libs/mesalib-1x/BUILD
@@ -1,21 +1,11 @@
-# fix llvm problem, by disabling rtti
-CXXFLAGS+=' -fno-rtti' &&
-case $MESALIB_GALLIUM in
- llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
- svga) OPTS="${OPTS} --enable-gallium-svga" ;;
- intel) OPTS="${OPTS} --enable-gallium-intel" ;;
- i915) OPTS="${OPTS} --enable-gallium-i915" ;;
- i965) OPTS="${OPTS} --enable-gallium-i965" ;;
- radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
- LDFLAGS="${LDFLAGS/-s/}" ;;
- r600) OPTS="${OPTS} --enable-gallium-r600" ;;
- nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
- swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
- none) OPTS="${OPTS} --disable-gallium" ;;
-esac &&
-
-OPTS="--with-dri-drivers=$MESALIB_DRIVERS_CONF \
+# I am confused about that. According to
+# https://bugs.freedesktop.org/show_bug.cgi?id=70471
+# llvm-config output should contain -fno-rtti.
+CXXFLAGS+=" -fno-rtti" &&
+OPTS="--with-dri-drivers=${MESALIB_DRIVERS// /,} \
+ --with-gallium-drivers=${MESALIB_GALLIUM// /,} \
$MESALIB_OPTS \
--with-egl-platforms=${MESA_EGL//\ /,} \
$OPTS" &&
+echo "OPTS=$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib-1x/CONFIGURE
b/graphics-libs/mesalib-1x/CONFIGURE
index 4c058f0..7cd72ae 100755
--- a/graphics-libs/mesalib-1x/CONFIGURE
+++ b/graphics-libs/mesalib-1x/CONFIGURE
@@ -28,10 +28,15 @@ case $MESALIB_BUILD in
fi &&


-# if list_find
+# TODO: Proper dependencies for those ... also libdrm ...
+ AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi swrast"
+
config_query_multi MESALIB_GALLIUM \
"What Gallium3D drivers woulld you like to build?" \
- none llvm svga i915 i965 radeon nouveau swrast
+ none all $AVAILABLE_GALLIUM
+ if [[ $MESALIB_GALLIUM = all ]]; then
+ MESALIB_GALLIUM=$AVAILABLE_GALLIUM
+ fi

if [[ $MESALIB_GALLIUM != none ]]; then
list_add MESALIB_OPTS "--enable-egl"
@@ -55,8 +60,12 @@ case $MESALIB_BUILD in
# config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x
API?" n \
# "--enable-gles1" "--disable-gles1"
else
+ MESALIB_GALLIUM=
config_query_option MESALIB_OPTS "enable EGL library?" y \
"--enable-egl" "--disable-egl"
+ if list_find --enable-egl "$MESALIB_OPTS"; then
+ MESALIB_OPTS+=" --enable-gbm" # Mandatory!
+ fi
fi
;;
xlib)
diff --git a/graphics-libs/mesalib-1x/DETAILS
b/graphics-libs/mesalib-1x/DETAILS
index ae93913..68a2d9a 100755
--- a/graphics-libs/mesalib-1x/DETAILS
+++ b/graphics-libs/mesalib-1x/DETAILS
@@ -1,7 +1,7 @@
SPELL=mesalib-1x
SPELLX=MesaLib
- VERSION=10.2.5
-
SOURCE_HASH=sha512:9ff5b8f36290c24527ca0fc5db8a4d8d0fca5b0f1a8e4c977ec34052d0e4e887e45a0d97e8819790fad0ed10b56ea2caaa1c3a373595a6620b8d0a5ac40ed17d
+ VERSION=10.2.6
+
SOURCE_HASH=sha512:07775699fe29f373f84265f7f715b15a945c66cb98bef05faf3cb86fc34accbd9ace3a77b5dae928259118846867324375d9f48b1fef4a92681ecc091aa66266
PATCHLEVEL=0
# VX=`echo $VERSION | cut -d. -f-2`
SX=${SPELLX}-${VERSION}
diff --git a/graphics-libs/mesalib-1x/HISTORY
b/graphics-libs/mesalib-1x/HISTORY
index 80d8423..1e2342b 100644
--- a/graphics-libs/mesalib-1x/HISTORY
+++ b/graphics-libs/mesalib-1x/HISTORY
@@ -1,3 +1,14 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, CONFIGURE: Change driver selection and make this beast build.
+ It is not perfect, but results in a working build including r600 and
+ nouveau drivers for me.
+ * PRE_BUILD, mesa-10.0-nv50-fix-build.patch: Remove typeid usage since
+ RTTI just won't work for us (another way would be to hack enforced
NDEBUG
+ where it belongs).
+
+2014-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 10.2.6
+
2014-08-11 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD, gl_select.patch: added to install GL headers and libs
to correct path for smgl-gl_select
diff --git a/graphics-libs/mesalib-1x/PRE_BUILD
b/graphics-libs/mesalib-1x/PRE_BUILD
index 307a239..8644f9f 100755
--- a/graphics-libs/mesalib-1x/PRE_BUILD
+++ b/graphics-libs/mesalib-1x/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# Wait ... why isn't NDEBUG in place? Seems to be filtered ...
+#
http://pkgs.fedoraproject.org/cgit/mesa.git/tree/mesa-10.0-nv50-fix-build.patch
+patch -p1 < "$SCRIPT_DIRECTORY/mesa-10.0-nv50-fix-build.patch" &&

patch -p0 < $SPELL_DIRECTORY/gl_select.patch &&
autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib-1x/PRE_BUILD.orig
b/graphics-libs/mesalib-1x/PRE_BUILD.orig
new file mode 100755
index 0000000..307a239
--- /dev/null
+++ b/graphics-libs/mesalib-1x/PRE_BUILD.orig
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/gl_select.patch &&
+autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
b/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
new file mode 100644
index 0000000..51d3160
--- /dev/null
+++ b/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
@@ -0,0 +1,12 @@
+diff -uNr mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+--- mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 11:29:21.000000000 +0400
++++ mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 16:05:06.488417551 +0400
+@@ -739,7 +739,7 @@
+ if (!i)
+ i = new_Instruction(pol.context(), op, dType);
+ #ifndef NDEBUG // non-conformant assert, so this is required
+- assert(typeid(*i) == typeid(*this));
++ //assert(typeid(*i) == typeid(*this));
+ #endif
+
+ pol.set<Instruction>(this, i);
diff --git a/xorg-driver/xf86-video-mga/DETAILS
b/xorg-driver/xf86-video-mga/DETAILS
index ca01f71..aaac41a 100755
--- a/xorg-driver/xf86-video-mga/DETAILS
+++ b/xorg-driver/xf86-video-mga/DETAILS
@@ -1,9 +1,9 @@
SPELL=xf86-video-mga
- VERSION=1.4.13
+ VERSION=1.6.3
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-#
SOURCE_HASH=sha512:d10174559875e06c8a79763263accdead3a64336cffbad20778099ae04bea7cf4cab95b829bd9bef54f2943058c44ee0c4a333a9e61ee5a29d0cbcb8269d14bd
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+
SOURCE_HASH=sha512:4e4e21021ac544d3d2119e731dda451638441f40b8ce469bcba1861237f5b2f2d7f85013852467c9e9c06aa0c1ce52798a0ad0c0f587b44f06b8d0e695bd4666
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-mga/HISTORY
b/xorg-driver/xf86-video-mga/HISTORY
index b317eea..f427a5a 100644
--- a/xorg-driver/xf86-video-mga/HISTORY
+++ b/xorg-driver/xf86-video-mga/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 1.6.3 (removed sig)
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB

diff --git a/xorg-driver/xf86-video-mga/xf86-video-mga-1.4.13.tar.bz2.sig
b/xorg-driver/xf86-video-mga/xf86-video-mga-1.4.13.tar.bz2.sig
deleted file mode 100644
index fd8f522..0000000
Binary files a/xorg-driver/xf86-video-mga/xf86-video-mga-1.4.13.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-driver/xf86-video-nouveau/HISTORY
b/xorg-driver/xf86-video-nouveau/HISTORY
index 06e88ba..f20a587 100644
--- a/xorg-driver/xf86-video-nouveau/HISTORY
+++ b/xorg-driver/xf86-video-nouveau/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: prevent shell syntax destruction by removal
+ of conditional body, providing eternal truth instead
+
2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on libdrm with nouveau API enabled

diff --git a/xorg-driver/xf86-video-nouveau/PRE_BUILD
b/xorg-driver/xf86-video-nouveau/PRE_BUILD
index 07ef3a8..6aa4746 100755
--- a/xorg-driver/xf86-video-nouveau/PRE_BUILD
+++ b/xorg-driver/xf86-video-nouveau/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit "s:.*configure.*::" autogen.sh
+# Do not provoke shell syntax errors by removing
+# whole if-then bodies.
+sedit "s:.*configure.*:true:" autogen.sh
./autogen.sh
diff --git a/xorg-driver/xf86-video-nv/DETAILS
b/xorg-driver/xf86-video-nv/DETAILS
index e0f582e..5577627 100755
--- a/xorg-driver/xf86-video-nv/DETAILS
+++ b/xorg-driver/xf86-video-nv/DETAILS
@@ -1,9 +1,9 @@
SPELL=xf86-video-nv
- VERSION=2.1.18
+ VERSION=2.1.20
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-#
SOURCE_HASH=sha512:042d945a89cca960c376e3328604f6df00a7bc50fa41ccc9090f355c4e114d18dc41db993ffeb34ad90c8bde6f1218a684f78d8820b741a9287ca50ef8558167
+
SOURCE_HASH=sha512:f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index da307ba..b144f95 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated to 2.1.20 (removed sig)
+ * PRE_BUILD: provide fake mibstore.h
+
2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.1.18
SOURCE matches upstream posted SHA1
diff --git a/xorg-driver/xf86-video-nv/PRE_BUILD
b/xorg-driver/xf86-video-nv/PRE_BUILD
new file mode 100755
index 0000000..7c3d653
--- /dev/null
+++ b/xorg-driver/xf86-video-nv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+touch src/mibstore.h
+
diff --git a/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.18.tar.bz2.sig
b/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.18.tar.bz2.sig
deleted file mode 100644
index 8c100af..0000000
Binary files a/xorg-driver/xf86-video-nv/xf86-video-nv-2.1.18.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Thomas Orgis (b3a5a74c8fb3028e4d5ec23dd01620aa06794a92), Thomas Orgis, 08/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page