Merge branch 'master' of git://openelec.git.sourceforge.net/gitroot/openelec/openelec into testing

.gitignore

@@ -5,3 +5,6 @@ sources/
 .stamps/
 
 target/
+
+tools/mkpkg/*
+!tools/mkpkg/mkpkg_*

config/options

@@ -50,6 +50,14 @@ PROJECT_DIR=$ROOT/projects
 #  multi-processor computer (like hyperthreading SMP CPU)
   CONCURRENCY_MAKE_LEVEL=1
 
+
+# set jpeg library depending on ARCH
+  if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
+    LIBJPEG="libjpeg-turbo"
+  else
+    LIBJPEG="jpeg"
+  fi
+
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = all ]; then
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"

packages/devel/pcre/url

@@ -1 +1 @@
-http://downloads.sourceforge.net/project/pcre/pcre/8.02/pcre-8.02.tar.bz2
+http://downloads.sourceforge.net/project/pcre/pcre/8.10/pcre-8.10.tar.bz2

packages/graphics/Mesa/build

@@ -15,7 +15,12 @@ $SCRIPTS/build libX11
 
 get_graphicdrivers
 
+# ensure we dont use size optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O3|"`
+
 cd $PKG_BUILD
+
 HOST_CC=$HOST_CC \
 HOST_OPT_FLAGS="$HOST_CFLAGS" \
 X11_INCLUDES= \

packages/graphics/libdrm/config/91-drm-modeset.rules

@@ -1 +0,0 @@
-KERNEL=="controlD[0-9]*",	NAME="dri/%k", MODE="0666"

packages/graphics/libdrm/install

@@ -7,10 +7,10 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 get_graphicdrivers
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/.libs/libdrm.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.libs/libdrm.so* $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL/usr/lib || true
+  cp -P $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL/usr/lib || true
 
 for drv in $DRM_DRIVERS; do
-  cp -PR $PKG_BUILD/$drv/.libs/libdrm_$drv*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/$drv/.libs/libdrm_$drv*.so* $INSTALL/usr/lib
     rm -rf $INSTALL/usr/lib/libdrm_$drv*.so*T
 done

packages/graphics/libjpeg-turbo/build

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+
+# ensure we dont use size optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O3|"`
+
+cd $PKG_BUILD
+
+$AUTORECONF
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --enable-shared \
+
+make
+
+$MAKEINSTALL

packages/graphics/libjpeg-turbo/install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib

packages/graphics/libjpeg-turbo/url

@@ -0,0 +1 @@
+http://sources.openelec.tv/svn/libjpeg-turbo-214.tar.bz2

packages/graphics/tiff/build

@@ -3,7 +3,7 @@
 . config/options
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build jpeg
+$SCRIPTS/build $LIBJPEG
 $SCRIPTS/build zlib
 
 cd $PKG_BUILD

packages/graphics/tiff/install

@@ -2,7 +2,7 @@
 
 . config/options
 
-$SCRIPTS/install jpeg
+$SCRIPTS/install $LIBJPEG
 $SCRIPTS/install zlib
 
 mkdir -p $INSTALL/usr/lib

packages/mediacenter/xbmc-theme-Confluence/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-theme-Confluence-31280.tar.bz2
+http://sources.openelec.tv/svn/xbmc-theme-Confluence-31392.tar.bz2

packages/mediacenter/xbmc/build

@@ -29,7 +29,7 @@ $SCRIPTS/build glew
 $SCRIPTS/build fontconfig #libass?
 $SCRIPTS/build fribidi
 
-$SCRIPTS/build jpeg
+$SCRIPTS/build $LIBJPEG
 $SCRIPTS/build libpng
 $SCRIPTS/build tiff
 $SCRIPTS/build freetype #libass?
@@ -111,6 +111,10 @@ else
   XBMC_CRYSTALHD="--disable-crystalhd"
 fi
 
+# ensure we dont use size optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O3|"`
+
 cd $PKG_BUILD
 
 ./bootstrap

packages/mediacenter/xbmc/install

@@ -26,7 +26,7 @@ $SCRIPTS/install glew
 $SCRIPTS/install fontconfig  #libass?
 $SCRIPTS/install fribidi
 
-$SCRIPTS/install jpeg
+$SCRIPTS/install $LIBJPEG
 $SCRIPTS/install libpng
 $SCRIPTS/install tiff
 $SCRIPTS/install freetype   #libass?

packages/mediacenter/xbmc/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-31280.tar.bz2
+http://sources.openelec.tv/svn/xbmc-31392.tar.bz2

packages/multimedia/SDL_image/build

@@ -4,7 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build SDL
-$SCRIPTS/build jpeg
+$SCRIPTS/build $LIBJPEG
 $SCRIPTS/build libpng
 $SCRIPTS/build tiff
 

packages/multimedia/SDL_image/install

@@ -3,7 +3,7 @@
 . config/options
 
 $SCRIPTS/install SDL
-$SCRIPTS/install jpeg
+$SCRIPTS/install $LIBJPEG
 $SCRIPTS/install libpng
 $SCRIPTS/install tiff
 

packages/network/install

@@ -8,4 +8,4 @@ $SCRIPTS/install dropbear
 $SCRIPTS/install wireless_tools
 $SCRIPTS/install wpa_supplicant
 
-[ "$PPP_DAEMON" = yes ] && $SCRIPTS/install ppp
+#[ "$PPP_DAEMON" = yes ] && $SCRIPTS/install ppp

packages/sysutils/dbus/build

@@ -10,8 +10,6 @@ export ac_cv_have_abstract_sockets=yes
 
 cd $PKG_BUILD
 
-$AUTORECONF
-
 mkdir -p .build-target
 cd .build-target
 

packages/sysutils/dbus/install

@@ -10,15 +10,15 @@ add_group dbus 81
 add_group netdev 497
 
 mkdir -p $INSTALL/usr/bin
-#  cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
+  cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
-#  cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
+  cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dbus
   cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus
@@ -29,11 +29,7 @@ mkdir -p $INSTALL/etc/dbus-1
   cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
   cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1
 
-mkdir -p $INSTALL/etc/dbus-1/event.d
 mkdir -p $INSTALL/etc/dbus-1/system.d
 mkdir -p $INSTALL/etc/dbus-1/session.d
 mkdir -p $INSTALL/usr/share/dbus-1/services
 mkdir -p $INSTALL/usr/share/dbus-1/system-services
-
-#  sed 's%<servicehelper>.*</servicehelper>%<servicehelper>/usr/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>%' \
-#    $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf

packages/sysutils/dbus/patches/dbus-1.2.24-remove_pie.diff

@@ -1,42 +0,0 @@
-diff -Naur dbus-1.2.24-old/bus/Makefile.am dbus-1.2.24-new/bus/Makefile.am
---- dbus-1.2.24-old/bus/Makefile.am	2010-03-23 12:01:27.000000000 -0700
-+++ dbus-1.2.24-new/bus/Makefile.am	2010-03-25 15:59:19.000000000 -0700
-@@ -1,7 +1,7 @@
- 
- configdir=$(sysconfdir)/dbus-1
- 
--INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
-+INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS)             		\
- 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
- 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
- 
-@@ -81,7 +81,7 @@
- 	$(top_builddir)/dbus/libdbus-convenience.la	\
- 	$(DBUS_BUS_LIBS)
- 
--dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
-+dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- 
- LAUNCH_HELPER_SOURCES=				\
- 	$(XML_SOURCES)				\
-diff -Naur dbus-1.2.24-old/bus/Makefile.in dbus-1.2.24-new/bus/Makefile.in
---- dbus-1.2.24-old/bus/Makefile.in	2010-03-23 12:11:23.000000000 -0700
-+++ dbus-1.2.24-new/bus/Makefile.in	2010-03-25 15:59:19.000000000 -0700
-@@ -459,7 +459,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
-+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)             		\
- 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
- 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
- 
-@@ -523,7 +523,7 @@
- 	$(top_builddir)/dbus/libdbus-convenience.la	\
- 	$(DBUS_BUS_LIBS)
- 
--dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
-+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
- 	$(XML_SOURCES)				\
- 	config-parser-common.c			\

packages/sysutils/dbus/url

@@ -1 +1 @@
-http://dbus.freedesktop.org/releases/dbus/dbus-1.2.24.tar.gz
+http://dbus.freedesktop.org/releases/dbus/dbus-1.3.1.tar.gz

packages/sysutils/parted/install

@@ -5,7 +5,7 @@
 $SCRIPTS/install util-linux-ng
 
 mkdir -p $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/parted/.libs/parted $INSTALL/usr/bin
+  cp $PKG_BUILD/parted/.libs/parted $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/libparted/.libs/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libparted/.libs/*.so* $INSTALL/usr/lib

packages/sysutils/parted/url

@@ -1 +1 @@
-http://ftp.gnu.org/gnu/parted/parted-2.2.tar.gz
+http://ftp.gnu.org/gnu/parted/parted-2.3.tar.gz

packages/sysutils/udev/url

@@ -1 +1 @@
-http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-157.tar.bz2
+http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-158.tar.bz2

packages/toolchain/devel/eglibc/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/eglibc-2.12-10591.tar.bz2
+http://sources.openelec.tv/svn/eglibc-2.12-10817.tar.bz2

packages/x11/driver/xf86-video-intel/build

@@ -9,6 +9,10 @@ $SCRIPTS/build xorg-server
 
 xorg_drv_configure_prepend
 
+# ensure we dont use size optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O3|"`
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \

packages/x11/driver/xf86-video-intel/url

@@ -1 +1 @@
-http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.11.901.tar.bz2
+http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.12.0.tar.bz2

packages/x11/util/util-macros/url

@@ -1 +1 @@
-http://xorg.freedesktop.org/archive/individual/util/util-macros-1.8.0.tar.bz2
+http://xorg.freedesktop.org/archive/individual/util/util-macros-1.10.0.tar.bz2

tools/mkpkg/mkpkg_eglibc-2.12

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+echo "getting sources..."
+  svn co svn://svn.eglibc.org/branches/eglibc-2_12/libc eglibc-2.12-latest
+  svn co svn://svn.eglibc.org/branches/eglibc-2_12/ports eglibc-2.12-latest/ports
+  svn co svn://svn.eglibc.org/branches/eglibc-2_12/linuxthreads/linuxthreads eglibc-2.12-latest/linuxthreads
+  svn co svn://svn.eglibc.org/branches/eglibc-2_12/linuxthreads/linuxthreads_db eglibc-2.12-latest/linuxthreads_db
+
+echo "getting version..."
+  cd eglibc-2.12-latest
+    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
+    echo $SVN_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf eglibc-2.12-$SVN_REV
+  cp -R eglibc-2.12-latest eglibc-2.12-$SVN_REV
+
+echo "cleaning sources..."
+  find eglibc-2.12-$SVN_REV -name .svn -exec rm -rf {} ";"
+
+echo "packing sources..."
+  tar cvjf eglibc-2.12-$SVN_REV.tar.bz2 eglibc-2.12-$SVN_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf eglibc-2.12-$SVN_REV

tools/mkpkg/mkpkg_eglibc-localedef

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+echo "getting sources..."
+  svn co svn://svn.eglibc.org/branches/eglibc-2_11/localedef eglibc-localedef-2.11-latest
+
+echo "getting version..."
+  cd eglibc-localedef-2.11-latest
+    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
+    echo $SVN_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf eglibc-localedef-2.11-$SVN_REV
+  cp -R eglibc-localedef-2.11-latest eglibc-localedef-2.11-$SVN_REV
+
+echo "cleaning sources..."
+  find eglibc-localedef-2.11-$SVN_REV -name .svn -exec rm -rf {} ";"
+
+echo "packing sources..."
+  tar cvjf eglibc-localedef-2.11-$SVN_REV.tar.bz2 eglibc-localedef-2.11-$SVN_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf eglibc-localedef-2.11-$SVN_REV

tools/mkpkg/mkpkg_libjpeg-turbo

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+echo "getting sources..."
+  svn co https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo/trunk libjpeg-turbo-latest
+
+echo "getting version..."
+  cd libjpeg-turbo-latest
+    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
+    echo $SVN_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf libjpeg-turbo-$SVN_REV
+  cp -R libjpeg-turbo-latest libjpeg-turbo-$SVN_REV
+
+echo "cleaning sources..."
+  find libjpeg-turbo-$SVN_REV -name .svn -exec rm -rf {} ";"
+
+echo "packing sources..."
+  tar cvjf libjpeg-turbo-$SVN_REV.tar.bz2 libjpeg-turbo-$SVN_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf libjpeg-turbo-$SVN_REV