Merge branch 'master' of git://github.com/chrschmidt/OpenELEC.tv

2025-07-29 13:46:49 +00:00 · 2011-10-26 06:41:25 +02:00 · 2011-10-26 06:41:25 +02:00 · 58c152974d
commit 58c152974d
parent 2059594cd9 fcc6131a71
32 changed files with 36 additions and 6 deletions
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-BUILD_DIRS="build.*"
+BUILD_DIRS=build.*

 all: system

@ -9,7 +9,7 @@ release:
 	./scripts/image release

 clean:
-	rm -rf $(BUILD_DIRS)
+	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps

 src-pkg:
 	tar cvjf sources.tar.bz2 sources .stamps
--- a/packages/x11/lib/libICE/build
+++ b/packages/x11/lib/libICE/build
@ -31,6 +31,7 @@ cd $PKG_BUILD
            --disable-static \
            --enable-shared \
            --disable-ipv6 \
+            --without-xmlto

 make

--- a/packages/x11/lib/libSM/build
+++ b/packages/x11/lib/libSM/build
@ -32,7 +32,7 @@ cd $PKG_BUILD
            --enable-shared \
            --with-libuuid \
            --without-xmlto \
-            --without-fop \
+            --without-fop

 make

--- a/packages/x11/lib/libXext/build
+++ b/packages/x11/lib/libXext/build
@ -30,7 +30,8 @@ cd $PKG_BUILD
            --localstatedir=/var \
            --disable-static \
            --enable-shared \
-            --enable-malloc0returnsnull
+            --enable-malloc0returnsnull \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/lib/libXfont/build
+++ b/packages/x11/lib/libXfont/build
@ -37,7 +37,8 @@ cd $PKG_BUILD
            --disable-bdfformat \
            --disable-snfformat \
            --enable-fc \
-            --with-gnu-ld
+            --with-gnu-ld \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/lib/libXmu/build
+++ b/packages/x11/lib/libXmu/build
@ -31,6 +31,7 @@ cd $PKG_BUILD
            --disable-static \
            --enable-shared \
            --with-gnu-ld \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/lib/xtrans/build
+++ b/packages/x11/lib/xtrans/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/bigreqsproto/build
+++ b/packages/x11/proto/bigreqsproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/compositeproto/build
+++ b/packages/x11/proto/compositeproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/damageproto/build
+++ b/packages/x11/proto/damageproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/dri2proto/build
+++ b/packages/x11/proto/dri2proto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/fixesproto/build
+++ b/packages/x11/proto/fixesproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/fontcacheproto/build
+++ b/packages/x11/proto/fontcacheproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/fontsproto/build
+++ b/packages/x11/proto/fontsproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/glproto/build
+++ b/packages/x11/proto/glproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/inputproto/build
+++ b/packages/x11/proto/inputproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/kbproto/build
+++ b/packages/x11/proto/kbproto/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --sysconfdir=/etc \
            --localstatedir=/var \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/randrproto/build
+++ b/packages/x11/proto/randrproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/recordproto/build
+++ b/packages/x11/proto/recordproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/renderproto/build
+++ b/packages/x11/proto/renderproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/scrnsaverproto/build
+++ b/packages/x11/proto/scrnsaverproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/videoproto/build
+++ b/packages/x11/proto/videoproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xcb-proto/build
+++ b/packages/x11/proto/xcb-proto/build
@ -26,6 +26,7 @@ cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
            --prefix=/usr \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xcmiscproto/build
+++ b/packages/x11/proto/xcmiscproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xextproto/build
+++ b/packages/x11/proto/xextproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xf86dgaproto/build
+++ b/packages/x11/proto/xf86dgaproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xf86driproto/build
+++ b/packages/x11/proto/xf86driproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xf86miscproto/build
+++ b/packages/x11/proto/xf86miscproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xf86vidmodeproto/build
+++ b/packages/x11/proto/xf86vidmodeproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xineramaproto/build
+++ b/packages/x11/proto/xineramaproto/build
@ -27,6 +27,7 @@ cd $PKG_BUILD
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
+            --without-xmlto

 make
 $MAKEINSTALL
--- a/packages/x11/proto/xproto-host/build
+++ b/packages/x11/proto/xproto-host/build
@ -33,7 +33,8 @@ mkdir -p .objdir-host && cd .objdir-host

 ../configure --host=$HOST_NAME \
             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN
+             --prefix=$ROOT/$TOOLCHAIN \
+             --without-xmlto

 make
 make install
--- a/packages/x11/proto/xproto/build
+++ b/packages/x11/proto/xproto/build
@ -28,6 +28,7 @@ mkdir -p .objdir-target && cd .objdir-target
 ../configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
+             --without-xmlto

 make
 $MAKEINSTALL