varios fixes

This commit is contained in:
Stephan Raue 2009-03-29 22:15:15 +02:00
parent 4858cf3e0f
commit dc107c0d8e
23 changed files with 8213 additions and 14 deletions

View File

@ -37,7 +37,7 @@ cd $BUILD/$1*
--enable-inotify \
--with-xml=expat \
--with-x \
--with-dbus-user=root \
--with-dbus-user=dbus \
--with-dbus-default-reply-timeout=60000 \
# --with-session-socket-dir=/var/run/dbus \

View File

@ -0,0 +1,63 @@
#!/bin/sh
. config/options
$SCRIPTS/build expat
$SCRIPTS/build glproto
$SCRIPTS/build dri2proto
$SCRIPTS/build libdrm
$SCRIPTS/build libXext
$SCRIPTS/build libXdamage
$SCRIPTS/build libXfixes
$SCRIPTS/build libXxf86vm
$SCRIPTS/build libX11
#$SCRIPTS/build libwsbm
cd $BUILD/$1*
HOST_CC=$HOST_CC \
OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \
HOST_OPT_FLAGS="$HOST_CFLAGS" \
X11_INCLUDES= \
DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \
DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--enable-shared \
--disable-debug \
--disable-selinux \
--disable-xcb \
--disable-glx-tls \
--enable-driglx-direct \
--disable-gl-osmesa \
--disable-glu \
--disable-glut \
--disable-glw \
--disable-motif \
--with-driver=dri \
--with-dri-drivers=swrast,unichrome \
--with-dri-driverdir="$XORG_PATH_DRI" \
--with-x \
--without-demos
make
# strip libmesa
#$STRIP src/mesa/libmesa.so*
# strip libglapi
#$STRIP src/mesa/libglapi.so*
# strip DRI drivers
$STRIP lib*/*.so*
## copy GLX headers for xorg-server to build
#cp -PR include/* $LIB_PREFIX/include
$MAKEINSTALL -C src/mesa
#$MAKEINSTALL -C src/glu
#DRI_DRIVER_INSTALL_DIR=$SYSROOT_PREFIX/$XORG_PATH_DRI

View File

@ -0,0 +1,21 @@
#!/bin/sh
. config/options
$SCRIPTS/install libXdamage
$SCRIPTS/install libdrm
$SCRIPTS/install expat
$SCRIPTS/install libXext
$SCRIPTS/install libXfixes
$SCRIPTS/install libXxf86vm
$SCRIPTS/install libX11
#$SCRIPTS/install libwsbm
mkdir -p $INSTALL/usr/lib
#cp -PR $BUILD/$1*/src/mesa/libmesa.so* $INSTALL/usr/lib
#cp -PR $BUILD/$1*/src/mesa/libglapi.so* $INSTALL/usr/lib
cp -PR $BUILD/$1*/lib/libGL.so* $INSTALL/usr/lib
#cp -PR $BUILD/$1*/lib/libGLU.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/dri
cp -PR $BUILD/$1*/lib/*_dri.so $INSTALL/usr/lib/dri

View File

@ -0,0 +1,47 @@
diff -Naur mesa-7.1rc1-20080706.orig/bin/mklib mesa-7.1rc1-20080706/bin/mklib
--- mesa-7.1rc1-20080706.orig/bin/mklib 2008-07-06 14:09:54.000000000 +0200
+++ mesa-7.1rc1-20080706/bin/mklib 2008-07-06 14:11:03.000000000 +0200
@@ -211,9 +211,9 @@
if [ "x$LINK" = "x" ] ; then
# -linker was not specified so set default link command now
if [ $CPLUSPLUS = 1 ] ; then
- LINK=g++
+ LINK=$CXX
else
- LINK=gcc
+ LINK=$CC
fi
fi
diff -Naur mesa-7.1rc1-20080706.orig/configs/linux-dri mesa-7.1rc1-20080706/configs/linux-dri
--- mesa-7.1rc1-20080706.orig/configs/linux-dri 2008-07-06 14:09:54.000000000 +0200
+++ mesa-7.1rc1-20080706/configs/linux-dri 2008-07-06 14:16:00.000000000 +0200
@@ -14,6 +14,7 @@
#MKDEP_OPTIONS = -MF depend
OPT_FLAGS = -O -g
+HOST_OPT_FLAGS = $(OPT_FLAGS)
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -29,6 +30,8 @@
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
+HOST_CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
+ $(HOST_OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
diff -Naur mesa-7.1rc1-20080706.orig/src/mesa/x86/Makefile mesa-7.1rc1-20080706/src/mesa/x86/Makefile
--- mesa-7.1rc1-20080706.orig/src/mesa/x86/Makefile 2008-07-06 14:09:54.000000000 +0200
+++ mesa-7.1rc1-20080706/src/mesa/x86/Makefile 2008-07-06 14:15:00.000000000 +0200
@@ -21,7 +21,7 @@
gen_matypes: gen_matypes.c
- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
+ $(HOST_CC) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
# need some special rules here, unfortunately
matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes

View File

@ -0,0 +1,105 @@
diff -Naur mesa-7.1.orig/src/mesa/drivers/directfb/Makefile mesa-7.1/src/mesa/drivers/directfb/Makefile
--- mesa-7.1.orig/src/mesa/drivers/directfb/Makefile 2008-08-30 17:04:52.000000000 +0200
+++ mesa-7.1/src/mesa/drivers/directfb/Makefile 2008-08-30 17:12:21.000000000 +0200
@@ -25,7 +25,7 @@
DIRECTFBGL_MESA = libidirectfbgl_mesa.so
-LIBS = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+LIBS = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so
.c.o:
diff -Naur mesa-7.1.orig/src/mesa/drivers/dri/Makefile.template mesa-7.1/src/mesa/drivers/dri/Makefile.template
--- mesa-7.1.orig/src/mesa/drivers/dri/Makefile.template 2008-08-30 17:04:52.000000000 +0200
+++ mesa-7.1/src/mesa/drivers/dri/Makefile.template 2008-08-30 17:07:18.000000000 +0200
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/src/mesa/libmesa.so
COMMON_SOURCES = \
../common/utils.c \
diff -Naur mesa-7.1.orig/src/mesa/drivers/fbdev/Makefile mesa-7.1/src/mesa/drivers/fbdev/Makefile
--- mesa-7.1.orig/src/mesa/drivers/fbdev/Makefile 2008-08-30 17:04:52.000000000 +0200
+++ mesa-7.1/src/mesa/drivers/fbdev/Makefile 2008-08-30 17:08:06.000000000 +0200
@@ -14,7 +14,7 @@
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so
.c.o:
diff -Naur mesa-7.1.orig/src/mesa/drivers/osmesa/Makefile mesa-7.1/src/mesa/drivers/osmesa/Makefile
--- mesa-7.1.orig/src/mesa/drivers/osmesa/Makefile 2008-08-30 17:04:52.000000000 +0200
+++ mesa-7.1/src/mesa/drivers/osmesa/Makefile 2008-08-30 17:09:15.000000000 +0200
@@ -19,7 +19,7 @@
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so
.PHONY: osmesa8
diff -Naur mesa-7.1.orig/src/mesa/drivers/x11/Makefile mesa-7.1/src/mesa/drivers/x11/Makefile
--- mesa-7.1.orig/src/mesa/drivers/x11/Makefile 2008-08-30 17:04:52.000000000 +0200
+++ mesa-7.1/src/mesa/drivers/x11/Makefile 2008-08-30 17:10:53.000000000 +0200
@@ -43,7 +43,7 @@
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+CORE_MESA = $(TOP)/src/mesa/libmesa.so $(TOP)/src/mesa/libglapi.so
diff -Naur mesa-7.1.orig/src/mesa/Makefile mesa-7.1/src/mesa/Makefile
--- mesa-7.1.orig/src/mesa/Makefile 2008-08-30 17:04:51.000000000 +0200
+++ mesa-7.1/src/mesa/Makefile 2008-08-30 17:11:54.000000000 +0200
@@ -20,8 +20,8 @@
# Default: build dependencies, then asm_subdirs, then convenience
-# libs (.a) and finally the device drivers:
-default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
+# libs (.so) and finally the device drivers:
+default: depend asm_subdirs libmesa.so libglapi.so driver_subdirs
@@ -29,17 +29,17 @@
# Helper libraries used by many drivers:
# Make archive of core mesa object files
-libmesa.a: $(MESA_OBJECTS)
- @ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
+libmesa.so: $(MESA_OBJECTS)
+ @ $(MKLIB) -o mesa -dlopen $(MESA_OBJECTS)
# Make archive of gl* API dispatcher functions only
-libglapi.a: $(GLAPI_OBJECTS)
- @ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
+libglapi.so: $(GLAPI_OBJECTS)
+ @ $(MKLIB) -o glapi -dlopen $(GLAPI_OBJECTS)
######################################################################
# Device drivers
-driver_subdirs: libmesa.a libglapi.a
+driver_subdirs: libmesa.so libglapi.so
(cd drivers && $(MAKE))
@@ -127,7 +127,7 @@
clean:
-rm -f */*.o
-rm -f */*/*.o
- -rm -f depend depend.bak libmesa.a libglapi.a
+ -rm -f depend depend.bak libmesa.so libglapi.so
-rm -f drivers/*/*.o
-rm -f *.pc
-@cd drivers/dri && $(MAKE) clean

View File

@ -0,0 +1 @@
http://switch.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-7.4.tar.bz2

View File

@ -1 +0,0 @@
http://sources.openelec.tv/svn/Mesa-openchrome-svn-20090121.tar.bz2

View File

@ -0,0 +1,29 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build libpthread-stubs
$SCRIPTS/build udev
$SCRIPTS/build linux
cd $BUILD/$1*
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-shared \
--enable-udev \
--enable-largefile \
# --enable-nouveau-experimental-api
$MAKE
#$MAKE -C linux-core LINUXDIR=$(kernel_path) DRM_MODULES=openchrome
$STRIP libdrm/.libs/libdrm.so*
$STRIP libdrm/intel/.libs/libdrm_intel.so*
#$STRIP libdrm/nouveau/.libs/*.so*
$MAKEINSTALL

View File

@ -0,0 +1,28 @@
#!/bin/sh
. config/options
$SCRIPTS/build module-init-tools
$SCRIPTS/install linux system
VER=`ls $BUILD/linux*/modules/lib/modules`
mkdir -p $INSTALL/usr/lib
cp -PR $BUILD/$1*/libdrm/.libs/libdrm.so* $INSTALL/usr/lib
cp -PR $BUILD/$1*/libdrm/intel/.libs/libdrm_intel.so* $INSTALL/usr/lib
#cp -PR $BUILD/$1*/libdrm/nouveau/.libs/libdrm_intel.so* $INSTALL/usr/lib
#mkdir -p "`ls -d $INSTALL/lib/modules/*`/kernel/drivers/gpu/drm"
#cp -r $BUILD/$1*/linux-core/drm.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm
#mkdir -p "`ls -d $INSTALL/lib/modules/*`/kernel/drivers/gpu/drm/openchrome"
#cp -r $BUILD/$1*/linux-core/openchrome/*.ko $INSTALL/lib/modules/*/kernel/drivers/gpu/drm/openchrome
#for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do
# $STRIP --strip-debug $MOD
#done
#$BUILD/module-init-tool*/depmod -b $INSTALL -v $VER > /dev/null
#for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
# rm -f $i
#done

View File

@ -0,0 +1 @@
http://dri.freedesktop.org/libdrm/libdrm-2.4.5.tar.bz2

View File

@ -63,10 +63,10 @@ py_cv_mod_dbus_=yes \
--disable-compat-libdns_sd \
--disable-compat-howl \
--with-xml=expat \
--with-avahi-user=root \
--with-avahi-group=root \
--with-autoipd-user=root \
--with-autoipd-group=root \
--with-avahi-user=avahi \
--with-avahi-group=avahi \
--with-autoipd-user=avahiautoipd \
--with-autoipd-group=avahiautoipd \
make

View File

@ -1,2 +1,8 @@
root:x:0:
audio:x:63:
audio:x:63:
avahi:x:495:
avahiautoipd:x:496:
haldaemon:x:68:
dbus:x:81:
netdev:x:497:

View File

@ -1 +1,5 @@
root:x:0:0:root:/storage:/bin/sh
haldaemon:x:68:68:HAL daemon:/:/bin/sh
avahi-autoipd:x:496:496:avahi-autoipd:/var/lib/avahi-autoipd:/bin/sh
avahi:x:495:495:avahi-daemon:/var/run/avahi-daemon:/bin/sh
dbus:x:81:81:System message bus:/:/bin/sh

View File

@ -54,8 +54,8 @@ cd $BUILD/$1*
--with-pci-ids=/usr/share \
--with-usb-ids=/usr/share \
--with-socket-dir=/var/run/dbus \
--with-hal-user=root \
--with-hal-group=root \
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
--with-backend=linux \
--with-keymaps \
--with-deprecated-keys \

View File

@ -15,4 +15,4 @@ if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
mount -o bind /storage /var/log
fi
xinit $XINITRC -- $XSERVERRC
xinit $XINITRC -- $XSERVERRC > /dev/null 2>&1

View File

@ -13,16 +13,13 @@ args=""
if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
args="${args} ELISA_DEBUG=*:5"
args="${args} GST_DEBUG=GST_ELEMENT_FACTORY:3"
args="${args} -l"
fi
if /usr/bin/test "${ELISA_FULLSCREEN}" = "yes" ; then
args="${args} -f"
fi
if /usr/bin/test "${ELISA_TMPLOG}" = "yes" ; then
args="${args} -l"
fi
if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
/usr/bin/elisa ${args} 2> $ELISA_LOGFILE
else

View File

@ -0,0 +1,20 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
cd $BUILD/$1*
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-shared \
--enable-dri \
--with-xorg-module-dir=$XORG_PATH_MODULES
make
$STRIP src/.libs/*.so
$STRIP libxvmc/.libs/*.so*

View File

@ -0,0 +1,33 @@
# NOTE: Comments in openchrome 0.2.1 driver source indicate this device does not
# exist in the wild, so it has been disabled for now.
#alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* openchrome
# 1106:3108 - K8M800 (PCI_CHIP_VT3204)
alias pcivideo:v00001106d00003108sv*sd*bc*sc*i* openchrome
# 1106:3118 - PM800/PM880/CN400 (PCI_CHIP_VT3259)
alias pcivideo:v00001106d00003118sv*sd*bc*sc*i* openchrome
# 1106:3122 - CLE266 (PCI_CHIP_CLE3122)
alias pcivideo:v00001106d00003122sv*sd*bc*sc*i* openchrome
# 1106:7205 - KM400/KN400 (PCI_CHIP_VT3205)
alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* openchrome
# 1106:3344 - VM800 (PCI_CHIP_VT3314)
alias pcivideo:v00001106d00003344sv*sd*bc*sc*i* openchrome
# 1106:3157 - CX700 (PCI_CHIP_VT3324)
alias pcivideo:v00001106d00003157sv*sd*bc*sc*i* openchrome
# 1106:3343 - P4M890 (PCI_CHIP_VT3327)
alias pcivideo:v00001106d00003343sv*sd*bc*sc*i* openchrome
# 1106:3230 - K8M890 (PCI_CHIP_VT3336)
alias pcivideo:v00001106d00003230sv*sd*bc*sc*i* openchrome
# 1106:3371 - P4M900 (PCI_CHIP_VT3364)
alias pcivideo:v00001106d00003371sv*sd*bc*sc*i* openchrome
# 1106:1122 - VX800 (PCI_CHIP_VT3353)
alias pcivideo:v00001106d00001122sv*sd*bc*sc*i* openchrome

View File

@ -0,0 +1,14 @@
#!/bin/sh
. config/options
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
cp $BUILD/$1*/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
mkdir -p $INSTALL/usr/lib
cp $BUILD/$1*/libxvmc/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/hwdata/videoaliases
cp $PKG_DIR/config/openchrome.xinf $INSTALL/usr/share/hwdata/videoaliases

View File

@ -0,0 +1,39 @@
diff -Naur xf86-video-openchrome-0.2.903.orig/configure xf86-video-openchrome-0.2.903/configure
--- xf86-video-openchrome-0.2.903.orig/configure 2008-08-30 17:34:34.000000000 +0200
+++ xf86-video-openchrome-0.2.903/configure 2008-08-30 17:34:50.000000000 +0200
@@ -21163,7 +21163,7 @@
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- test "$cross_compiling" = yes &&
+ test "$cross_compiling" = dummy &&
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
@@ -21188,7 +21188,7 @@
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- test "$cross_compiling" = yes &&
+ test "$cross_compiling" = dummy &&
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
@@ -21213,7 +21213,7 @@
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- test "$cross_compiling" = yes &&
+ test "$cross_compiling" = dummy &&
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
@@ -21563,7 +21563,7 @@
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- test "$cross_compiling" = yes &&
+ test "$cross_compiling" = dummy &&
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }

View File

@ -0,0 +1 @@
http://openchrome.org/releases/xf86-video-openchrome-0.2.903.tar.bz2

View File

@ -24,6 +24,11 @@
<execute>mrxvt</execute>
</action>
</keybind>
<keybind key="C-A-e">
<action name="Execute">
<execute>eject</execute>
</action>
</keybind>
</keyboard>
</openbox_config>