diff --git a/config/options b/config/options index 55e1e17667..e335e71cb1 100644 --- a/config/options +++ b/config/options @@ -1,7 +1,9 @@ # Project name PROJECT=generic -PROJECT_DIR=~/.openelec +MESA=Mesa +LIBDRM=libdrm +DRIDRIVERS="swrast,unichrome" # Target system we want to cross compile for (i386/x86_64/powerpc) TARGET_ARCH=i386 @@ -210,6 +212,8 @@ AUTOUPDATE=ask CONCURRENCY_MAKE_LEVEL=1 # read personal options if available +PROJECT_DIR=~/.openelec + test -f "$PROJECT_DIR/options" \ && . "$PROJECT_DIR/options" diff --git a/packages/graphics/Mesa/10_cross-compile.diff b/packages/graphics/Mesa/10_cross-compile.diff deleted file mode 100644 index fd9ea72187..0000000000 --- a/packages/graphics/Mesa/10_cross-compile.diff +++ /dev/null @@ -1,47 +0,0 @@ -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 diff --git a/packages/graphics/Mesa/20_libmesa-shared.diff b/packages/graphics/Mesa/20_libmesa-shared.diff deleted file mode 100644 index 7227c9ed22..0000000000 --- a/packages/graphics/Mesa/20_libmesa-shared.diff +++ /dev/null @@ -1,105 +0,0 @@ -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 diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index 33dc474e5a..41eac1c6ba 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -5,13 +5,13 @@ $SCRIPTS/build expat $SCRIPTS/build glproto $SCRIPTS/build dri2proto -$SCRIPTS/build libdrm +$SCRIPTS/build $LIBDRM $SCRIPTS/build libXext $SCRIPTS/build libXdamage $SCRIPTS/build libXfixes $SCRIPTS/build libXxf86vm $SCRIPTS/build libX11 -$SCRIPTS/build libwsbm +#$SCRIPTS/build libwsbm cd $BUILD/$1* HOST_CC=$HOST_CC \ @@ -38,7 +38,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ --disable-glw \ --disable-motif \ --with-driver=dri \ - --with-dri-drivers=swrast,openchrome \ + --with-dri-drivers=$DRIDRIVERS \ --with-dri-driverdir="$XORG_PATH_DRI" \ --with-x \ --without-demos diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 0aaf4c2b77..2874163899 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -3,16 +3,15 @@ . config/options $SCRIPTS/install libXdamage -$SCRIPTS/install libdrm +$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/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 diff --git a/packages/graphics/Mesa/patches/10_cross-compile.diff b/packages/graphics/Mesa/patches/10_cross-compile.diff index 74ad83226a..fd9ea72187 100644 --- a/packages/graphics/Mesa/patches/10_cross-compile.diff +++ b/packages/graphics/Mesa/patches/10_cross-compile.diff @@ -1,7 +1,7 @@ -diff -Naur Mesa-openchrome-svn-20090302/bin/mklib Mesa-openchrome-svn-20090302.patch/bin/mklib ---- Mesa-openchrome-svn-20090302/bin/mklib 2009-02-26 12:02:26.000000000 +0100 -+++ Mesa-openchrome-svn-20090302.patch/bin/mklib 2009-03-03 01:48:26.000000000 +0100 -@@ -217,9 +217,9 @@ +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 @@ -13,24 +13,35 @@ diff -Naur Mesa-openchrome-svn-20090302/bin/mklib Mesa-openchrome-svn-20090302.p fi fi -diff -Naur Mesa-openchrome-svn-20090302/configs/linux-dri Mesa-openchrome-svn-20090302.patch/configs/linux-dri ---- Mesa-openchrome-svn-20090302/configs/linux-dri 2009-02-26 12:02:26.000000000 +0100 -+++ Mesa-openchrome-svn-20090302.patch/configs/linux-dri 2009-03-03 01:49:56.000000000 +0100 +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 = -O2 -g + OPT_FLAGS = -O -g +HOST_OPT_FLAGS = $(OPT_FLAGS) PIC_FLAGS = -fPIC # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -@@ -30,6 +31,9 @@ +@@ -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) - GLUT_CFLAGS = -fexceptions +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 diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 7773e2d469..5833d83469 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/Mesa-openchrome-svn-20090329.tar.bz2 +http://switch.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-7.4.tar.bz2 \ No newline at end of file diff --git a/packages/graphics/libdrm/build b/packages/graphics/libdrm/build index 6e1eac683b..7f7d422cb0 100755 --- a/packages/graphics/libdrm/build +++ b/packages/graphics/libdrm/build @@ -5,7 +5,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libpthread-stubs $SCRIPTS/build udev -$SCRIPTS/build linux +#$SCRIPTS/build linux cd $BUILD/$1* ./configure --host=$TARGET_NAME \ @@ -15,13 +15,11 @@ cd $BUILD/$1* --disable-static \ --enable-shared \ --enable-udev \ - --enable-largefile + --enable-largefile \ $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/intel/.libs/libdrm_intel.so* $MAKEINSTALL diff --git a/packages/graphics/libdrm/install b/packages/graphics/libdrm/install index 5f03388f59..6493a129f2 100755 --- a/packages/graphics/libdrm/install +++ b/packages/graphics/libdrm/install @@ -2,28 +2,6 @@ . 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 - -#mkdir -p $INSTALL/lib/modules/$VER - -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 +cp -PR $BUILD/$1*/libdrm/intel/.libs/libdrm_intel.so* $INSTALL/usr/lib diff --git a/packages/graphics/libdrm/url b/packages/graphics/libdrm/url index 759edaad38..23733a8c03 100644 --- a/packages/graphics/libdrm/url +++ b/packages/graphics/libdrm/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/libdrm-newttm-svn-20090329.2.tar.bz2 +http://dri.freedesktop.org/libdrm/libdrm-2.4.5.tar.bz2 diff --git a/packages/linux/unpack b/packages/linux/unpack index 56fdc92b2a..db74c29cb2 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -9,15 +9,15 @@ $SCRIPTS/unpack lzma LINUX=`ls -d $BUILD/$1*` PKG_DIR=`find $PACKAGES -type d -name $1` -#make -C $LINUX mrproper -#make -C $LINUX ARCH=$TARGET_ARCH headers_check make -C $LINUX ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install -test -f "config/projects/$PROJECT/options" && - -[ -f $PROJECT_DIR/$1/$1.$TARGET_ARCH.conf ] && \ - KERNEL_CFG_FILE=$PROJECT_DIR/$1/$1.$TARGET_ARCH.conf || \ +if [ -f $PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf ]; then + KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf +elif [ -f $PROJECT_DIR/$1/$1.$TARGET_ARCH.conf ]; then + KERNEL_CFG_FILE=$PROJECT_DIR/$1/$1.$TARGET_ARCH.conf +else KERNEL_CFG_FILE=$PKG_DIR/config/$1.$TARGET_ARCH.conf +fi sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $HOST_CXX|" \ diff --git a/packages/other/clutter/build b/packages/other/clutter/build index 255e276f1f..1d13df652e 100755 --- a/packages/other/clutter/build +++ b/packages/other/clutter/build @@ -3,7 +3,7 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build Mesa +$SCRIPTS/build $MESA $SCRIPTS/build pango $SCRIPTS/build cairo #$SCRIPTS/build gstreamer diff --git a/packages/other/clutter/install b/packages/other/clutter/install index 39a2962849..d1b5bbf7e9 100755 --- a/packages/other/clutter/install +++ b/packages/other/clutter/install @@ -2,7 +2,7 @@ . config/options -$SCRIPTS/install Mesa +$SCRIPTS/install $MESA $SCRIPTS/install pango $SCRIPTS/install cairo $SCRIPTS/install libX11 diff --git a/packages/other/libwsbm/build b/packages/other/libwsbm/build index 41e1a411e1..c0ccd26515 100755 --- a/packages/other/libwsbm/build +++ b/packages/other/libwsbm/build @@ -3,7 +3,7 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build libdrm +$SCRIPTS/build $LIBDRM cd $BUILD/$1* ./configure --host=$TARGET_NAME \ diff --git a/packages/other/pigment/build b/packages/other/pigment/build index dbfa84d03c..9e0a202194 100755 --- a/packages/other/pigment/build +++ b/packages/other/pigment/build @@ -3,7 +3,7 @@ . config/options $SCRIPTS/build toolchain -$SCRIPTS/build Mesa +$SCRIPTS/build $MESA $SCRIPTS/build pango $SCRIPTS/build cairo $SCRIPTS/build gstreamer diff --git a/packages/other/pigment/install b/packages/other/pigment/install index 1a87c35771..c03dd7feba 100755 --- a/packages/other/pigment/install +++ b/packages/other/pigment/install @@ -2,7 +2,7 @@ . config/options -$SCRIPTS/install Mesa +$SCRIPTS/install $MESA $SCRIPTS/install pango $SCRIPTS/install cairo $SCRIPTS/install gstreamer diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build index d23c15e82c..ebf4ee7c8a 100755 --- a/packages/sysutils/busybox/build +++ b/packages/sysutils/busybox/build @@ -6,9 +6,13 @@ $SCRIPTS/build toolchain PKG_DIR=`find $PACKAGES -type d -name $1` -[ -f $PROJECT_DIR/$1/$1.conf ] && \ - BUSYBOX_CFG_FILE=$PROJECT_DIR/$1/$1.conf || \ +if [ -f $PROJECT_DIR/$PROJECT/$1/$1.conf ]; then + BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.conf +elif [ -f $PROJECT_DIR/$1/$1.conf ]; then + BUSYBOX_CFG_FILE=$PROJECT_DIR/$1/$1.conf +else BUSYBOX_CFG_FILE=$PKG_DIR/config/$1.conf +fi cd $BUILD/$1* # Build Busybox for initramfs diff --git a/packages/virtual/image/install b/packages/virtual/image/install index caec28716f..27fb529594 100755 --- a/packages/virtual/image/install +++ b/packages/virtual/image/install @@ -85,25 +85,28 @@ case "$2" in ln -sf /var/mnt $INSTALL/mnt mkdir -p $ROOT/target - rm -rf $ROOT/target/image-$PROJECT.$2 - $ROOT/$TOOLCHAIN/bin/mksquashfs $INSTALL $ROOT/target/image-$PROJECT.$2 -noappend -all-root -# $ROOT/$TOOLCHAIN/bin/mkfs.axfs $INSTALL openelec.$2 + rm -rf $ROOT/target/$PROJECT-$MEDIACENTER.kernel + cp build.$PROJECT.*/linux-*/arch/x86/boot/bzImage $ROOT/target/$PROJECT-$MEDIACENTER.kernel + + rm -rf $ROOT/target/$PROJECT-$MEDIACENTER.$2 + $ROOT/$TOOLCHAIN/bin/mksquashfs $INSTALL $ROOT/target/$PROJECT-$MEDIACENTER.$2 -noappend -all-root +# $ROOT/$TOOLCHAIN/bin/mkfs.axfs $INSTALL openelec.$2 ;; img) mkdir -p $ROOT/target - rm -rf $ROOT/target/qemu-image.$PROJECT.flash - qemu-img create -f raw $ROOT/target/qemu-image.$PROJECT.flash 50M - /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/qemu-image.$PROJECT.flash + rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash + qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash 50M + /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash mkdir -p $ROOT/.tmp - sudo mount -o loop $ROOT/target/qemu-image.$PROJECT.flash $ROOT/.tmp - cp -R $ROOT/target/image-$PROJECT.system $ROOT/.tmp - sudo umount $ROOT/.tmp + sudo mount -o loop $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash $ROOT/.tmp + cp -R $ROOT/target/$PROJECT-$MEDIACENTER.system $ROOT/.tmp + sudo umount $ROOT/.tmp - rm -rf $ROOT/target/qemu-image.$PROJECT.store - qemu-img create -f raw $ROOT/target/qemu-image.$PROJECT.store 40M - /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/qemu-image.$PROJECT.store + rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store + qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store 40M + /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store ;; diff --git a/packages/x11/driver/xf86-video-openchrome/build b/packages/x11/driver/xf86-video-openchrome/build index 26c3893fd0..2ceccc9e4e 100755 --- a/packages/x11/driver/xf86-video-openchrome/build +++ b/packages/x11/driver/xf86-video-openchrome/build @@ -17,4 +17,4 @@ cd $BUILD/$1* make $STRIP src/.libs/*.so -#$STRIP libxvmc/.libs/*.so* +$STRIP libxvmc/.libs/*.so* diff --git a/packages/x11/driver/xf86-video-openchrome/config/openchrome.xinf b/packages/x11/driver/xf86-video-openchrome/config/openchrome.xinf index a48d8da78a..d31422fba5 100644 --- a/packages/x11/driver/xf86-video-openchrome/config/openchrome.xinf +++ b/packages/x11/driver/xf86-video-openchrome/config/openchrome.xinf @@ -28,3 +28,6 @@ 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 diff --git a/packages/x11/driver/xf86-video-openchrome/install b/packages/x11/driver/xf86-video-openchrome/install index 3a5fa54a66..0c4a6e1bd6 100755 --- a/packages/x11/driver/xf86-video-openchrome/install +++ b/packages/x11/driver/xf86-video-openchrome/install @@ -7,8 +7,8 @@ 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/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 +cp $PKG_DIR/config/openchrome.xinf $INSTALL/usr/share/hwdata/videoaliases \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff b/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff deleted file mode 100644 index 4eac26aa5d..0000000000 --- a/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur xf86-video-openchrome-20090302/Makefile.am xf86-video-openchrome-20090302.patch/Makefile.am ---- xf86-video-openchrome-20090302/Makefile.am 2008-10-29 10:54:10.000000000 +0100 -+++ xf86-video-openchrome-20090302.patch/Makefile.am 2009-03-24 09:58:46.040036529 +0100 -@@ -19,6 +19,6 @@ - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - AUTOMAKE_OPTIONS = foreign --SUBDIRS = src man -+SUBDIRS = src man libxvmc - - EXTRA_DIST = COPYING NEWS README -diff -Naur xf86-video-openchrome-20090302/Makefile.in xf86-video-openchrome-20090302.patch/Makefile.in ---- xf86-video-openchrome-20090302/Makefile.in 2009-03-03 01:13:33.000000000 +0100 -+++ xf86-video-openchrome-20090302.patch/Makefile.in 2009-03-24 09:58:59.013295184 +0100 -@@ -215,7 +215,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign --SUBDIRS = src man -+SUBDIRS = src man libxvmc - EXTRA_DIST = COPYING NEWS README - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/packages/x11/driver/xf86-video-openchrome/patches/10_crosscompile.diff b/packages/x11/driver/xf86-video-openchrome/patches/10_crosscompile.diff deleted file mode 100644 index 42daef7ad9..0000000000 --- a/packages/x11/driver/xf86-video-openchrome/patches/10_crosscompile.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur xf86-video-openchrome-20090302/configure xf86-video-openchrome-20090302.patch/configure ---- xf86-video-openchrome-20090302/configure 2009-03-03 01:13:31.000000000 +0100 -+++ xf86-video-openchrome-20090302.patch/configure 2009-03-03 01:59:36.000000000 +0100 -@@ -13330,7 +13330,7 @@ - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = dummy && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - $as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -@@ -13358,7 +13358,7 @@ - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = dummy && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - $as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -@@ -13386,7 +13386,7 @@ - if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = dummy && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - $as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } diff --git a/packages/x11/driver/xf86-video-openchrome/url b/packages/x11/driver/xf86-video-openchrome/url index fccdae1c9b..d81dc5a98d 100644 --- a/packages/x11/driver/xf86-video-openchrome/url +++ b/packages/x11/driver/xf86-video-openchrome/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xf86-video-openchrome-20090329.tar.bz2 +http://openchrome.org/releases/xf86-video-openchrome-0.2.903.tar.bz2 \ No newline at end of file diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 76bd2347d3..a0bababa02 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -19,13 +19,12 @@ $SCRIPTS/build xf86dgaproto $SCRIPTS/build xf86miscproto $SCRIPTS/build libpciaccess $SCRIPTS/build libX11 -#$SCRIPTS/build libXinerama $SCRIPTS/build libXfont $SCRIPTS/build libxkbfile $SCRIPTS/build libXv $SCRIPTS/build libXvMC -$SCRIPTS/build libdrm -$SCRIPTS/build Mesa +$SCRIPTS/build $LIBDRM +$SCRIPTS/build $MESA $SCRIPTS/build openssl $SCRIPTS/build freetype $SCRIPTS/build libfontenc @@ -35,17 +34,6 @@ $SCRIPTS/build xf86bigfontproto $SCRIPTS/build dbus $SCRIPTS/build hal -#fixesproto -#damageproto -#xcmiscproto -#xextproto -#xproto -#xtrans -#bigreqsproto -#inputproto -#kbproto -#xineramaproto - cd $BUILD/$1* ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -110,7 +98,7 @@ cd $BUILD/$1* --with-gnu-ld \ --enable-install-libxf86config \ --with-os-vendor="OpenELEC" \ - --with-mesa-source=`ls -d $ROOT/$BUILD/Mesa*` \ + --with-mesa-source=`ls -d $ROOT/$BUILD/$MESA*` \ --with-module-dir=$XORG_PATH_MODULES \ --with-xkb-path=$XORG_PATH_XKB \ --with-xkb-output=$XORG_PATH_XKB_OUTPUT \ @@ -119,16 +107,6 @@ cd $BUILD/$1* --with-fontdir=$XORG_PATH_FONTS \ --with-default-font-path="$XORG_PATH_FONTS/liberation,$XORG_PATH_FONTS/misc" \ -# --enable-unix-transport \ -# --disable-tcp-transport \ -# --disable-ipv6 \ -# --disable-local-transport \ -# --enable-kbd_mode \ - -# --enable-unix-transport \ -# --disable-tcp-transport \ -# --disable-local-transport \ - make $STRIP hw/xfree86/Xorg diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 8afe954b53..8634f0e30c 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -9,8 +9,8 @@ $SCRIPTS/install libXfont #$SCRIPTS/install libXinerama $SCRIPTS/install libXv #$SCRIPTS/install libXvMC -$SCRIPTS/install libdrm -$SCRIPTS/install Mesa +$SCRIPTS/install $LIBDRM +$SCRIPTS/install $MESA $SCRIPTS/install pixman $SCRIPTS/install dbus $SCRIPTS/install hal