Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xf86-video-intel: fix module load error #357

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions KEEP/smu.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,7 @@
VERSION = 1.4

# paths
-PREFIX = /usr/local
+PREFIX = /
MANPREFIX = ${PREFIX}/share/man

# includes and libs
40 changes: 40 additions & 0 deletions pkg/graphite2
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[vars]
filesize=8495904
sha512=00ec4ec3de02b22aa9a723a5ce529e9e1ed81677627f5101e0d224ea0b0bd1349bc6b4d5d7b1accb5db47f5f53ea823b4217b1784e4b6f647d8f6e987a58f42a

[mirrors]
http://downloads.sourceforge.net/silgraphite/graphite2-1.3.1.tgz

[deps]

[deps.host]
cmake

[build]
mkdir -p build && cd build
for i in ar ld nm objcopy objdump strip ; do
printf '#!/bin/sh\n%s%s "$@"\n' "$CROSS_COMPILE" "$i" > "$CROSS_COMPILE""$i"
chmod +x "$CROSS_COMPILE""$i"
done
[ -n "$CROSS_COMPILE" ] && xconfflags="
-DCMAKE_FIND_ROOT_PATH=$butch_root_dir$butch_prefix \
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-DCMAKE_AR="$CROSS_COMPILE"ar \
-DCMAKE_LD="$CROSS_COMPILE"ld \
-DCMAKE_NM="$CROSS_COMPILE"nm \
-DCMAKE_OBJCOPY="$CROSS_COMPILE"objcopy \
-DCMAKE_OBJDUMP="$CROSS_COMPILE"objdump \
-DCMAKE_STRIP="$CROSS_COMPILE"strip \
"

CFLAGS="-D_GNU_SOURCE $optcflags" \
LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
CXXFLAGS="$optcflags" \
cmake $xconfflags \
-DCMAKE_INSTALL_PREFIX="$butch_prefix" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
..
make -j$MAKE_THREADS VERBOSE=1
make DESTDIR="$butch_install_dir" install
5 changes: 4 additions & 1 deletion pkg/harfbuzz
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ sha512=9dcc8f5790b78efa14d328e48c68d97f44fce8658fdad9f6d46a79feb715a57903064087d

[deps]
freetype
icu
graphite2

[build]
#patch -p1 < "$K"/some.patch
Expand All @@ -18,7 +20,8 @@ freetype
CPPFLAGS="-D_GNU_SOURCE" CFLAGS="$optcflags" CXXFLAGS="$optcflags" \
LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
./configure -C --prefix="$butch_prefix" --disable-nls $xconfflags \
--with-icu=no
--with-icu=yes \
--with-graphite2=yes

#[ -n "$CROSS_COMPILE" ] && "$K"/libtool.cross.gen --sysroot="$butch_root_dir"

Expand Down
19 changes: 19 additions & 0 deletions pkg/smu
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[vars]
filesize=9617
sha512=75f411ff289a30a686ac9d14aab2171d08eef1597b4810bd45b07336273b81a5efe4c8d4fe9a217fb2d063911af001a1f397b64ccad4c65f01f31e2766997b8a
tardir=smu-1.4

[mirrors]
https://github.com/Gottox/smu/archive/v1.4.tar.gz

[deps]

[build]
patch -p1 < "$K"/smu.patch

[ -n "$CROSS_COMPILE" ] && \
xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') \
--with-sysroot=$butch_root_dir"

make V=1 -j$MAKE_THREADS
make DESTDIR="$butch_install_dir" install
1 change: 0 additions & 1 deletion pkg/xf86-video-intel
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.99.916
patch -p1 < "$K"/xf86-video-intel-dri2.patch
./configure -C --prefix="$butch_prefix" \
--enable-xvmc \
--enable-dri2 \
--disable-selective-werror

# --enable-glamor \
Expand Down