Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

This commit is contained in:
Stephan Raue 2011-10-09 18:38:19 +02:00
commit 2b77f1190b
21 changed files with 75 additions and 75 deletions

View File

@ -24,7 +24,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="ftp://ftp.alsa-project.org/pub/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -24,7 +24,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="alsa-lib"
PKG_BUILD_DEPENDS="toolchain alsa-lib"
PKG_PRIORITY="optional"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libplist"
PKG_VERSION="1.3"
PKG_VERSION="1.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://matt.colyer.name/projects/iphone-linux/"
PKG_URL="http://github.com/downloads/JonathanBeck/libplist/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libxml2 glib"
PKG_BUILD_DEPENDS="toolchain libxml2 glib"
PKG_PRIORITY="optional"

View File

@ -71,7 +71,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
--disable-gbm \
--disable-gallium-egl \
--disable-gallium-gbm \
--disable-shared-glapi \
--enable-shared-glapi \
--enable-xcb \
--disable-shared-dricore \
--disable-egl \

View File

@ -27,7 +27,7 @@ mkdir -p $INSTALL/usr/lib
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
# cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/dri
# cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.10"
PKG_VERSION="0.0.12"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"

View File

@ -27,7 +27,12 @@ if lspci -n | grep 0300 | grep -q 10de; then
fi
if lspci -n | grep 0300 | grep -q 1002; then
[ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
if [ -f /storage/.config/xorg.conf ]; then
XORG="/storage/.config/xorg.conf"
else
XORG="/etc/X11/xorg-fglrx.conf"
fi
[ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
fi
echo "${TEMP} C"

View File

@ -23,13 +23,11 @@
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwii $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwiiconn $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwiidump $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwiishow $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/libxwiimote.so* $INSTALL/usr/lib
cp $PKG_BUILD/lib/libxwiimote.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
cp $PKG_BUILD/res/50-xorg-disable-wiimote.conf $INSTALL/usr/share/X11/xorg.conf.d

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xwiimote"
PKG_VERSION="7341491"
PKG_VERSION="0b79d97"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -0,0 +1,45 @@
diff -Naur xwiimote-0b79d97/lib/Makefile xwiimote-0b79d97.patch/lib/Makefile
--- xwiimote-0b79d97/lib/Makefile 2011-10-07 01:24:24.000000000 +0200
+++ xwiimote-0b79d97.patch/lib/Makefile 2011-10-07 01:32:17.403217723 +0200
@@ -4,13 +4,15 @@
# Dedicated to the Public Domain
#
+CC ?= gcc
+
SFSPATH=../../misc/libmisc/libsfs
all: libxwiimote.so
# build xwiimote library
libxwiimote.so: event.c udev.c sfs.c xwiimote.h libsfs.h
- gcc -o $@ $^ -ludev -Wall -shared -fPIC
+ $(CC) -o $@ $^ -ludev -Wall -shared -fPIC
#
# The copy rule is only used by maintainers to copy the most recent version of
diff -Naur xwiimote-0b79d97/tools/Makefile xwiimote-0b79d97.patch/tools/Makefile
--- xwiimote-0b79d97/tools/Makefile 2011-10-07 01:24:24.000000000 +0200
+++ xwiimote-0b79d97.patch/tools/Makefile 2011-10-07 01:32:53.053681433 +0200
@@ -4,6 +4,8 @@
# Dedicated to the Public Domain
#
+CC ?= gcc
+
.PHONY: all clean
all: xwiishow xwiidump
@@ -12,10 +14,10 @@
@rm -fv xwiishow xwiidump
xwiishow: xwiishow.c ../lib/libxwiimote.so
- gcc -o xwiishow xwiishow.c -Wall ../lib/libxwiimote.so -I../lib
+ $(CC) -o xwiishow xwiishow.c -Wall -L../lib/ -lxwiimote -I../lib
xwiidump: xwiidump.c
- gcc -o xwiidump xwiidump.c -Wall
+ $(CC) -o xwiidump xwiidump.c -Wall
../lib/libxwiimote.so:
@echo Making library

View File

@ -1,52 +0,0 @@
diff -Naur xwiimote-7341491-old/makefile xwiimote-7341491-new/makefile
--- xwiimote-7341491-old/makefile 2011-08-02 10:16:15.000000000 -0700
+++ xwiimote-7341491-new/makefile 2011-08-02 10:20:01.000000000 -0700
@@ -4,12 +4,14 @@
# Dedicated to the Public Domain
#
+CC ?= gcc
+
.PHONY: build clean
build: libxwiimote.so
libxwiimote.so: lib/*.c
- gcc -shared -o libxwiimote.so lib/*.c -fPIC -Wall -O2 -ludev
+ $(CC) -shared -o libxwiimote.so lib/*.c -fPIC -Wall -O2 -ludev $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
clean:
@rm -fv libxwiimote.so
diff -Naur xwiimote-7341491-old/tools/makefile xwiimote-7341491-new/tools/makefile
--- xwiimote-7341491-old/tools/makefile 2011-08-02 10:16:15.000000000 -0700
+++ xwiimote-7341491-new/tools/makefile 2011-08-02 10:21:44.000000000 -0700
@@ -4,6 +4,8 @@
# Dedicated to the Public Domain
#
+CC ?= gcc
+
.PHONY: all clean
all: xwiiconn xwii xwiishow xwiidump
@@ -12,16 +14,16 @@
@rm -fv xwiiconn xwii xwiishow xwiidump
xwiiconn: xwiiconn.c
- gcc -o xwiiconn xwiiconn.c -Wall -O0 -g -lbluetooth `pkg-config --libs --cflags dbus-glib-1 glib-2.0`
+ $(CC) -o xwiiconn xwiiconn.c -Wall -O0 -g -lbluetooth `pkg-config --libs --cflags dbus-glib-1 glib-2.0` $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
xwii: xwii.c ../libxwiimote.so
- gcc -o xwii xwii.c -Wall -O0 -g ../libxwiimote.so -I../lib
+ $(CC) -o xwii xwii.c -Wall -O0 -g -L../ -lxwiimote -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
xwiishow: xwiishow.c ../libxwiimote.so
- gcc -o xwiishow xwiishow.c -Wall -O0 -g ../libxwiimote.so -I../lib
+ $(CC) -o xwiishow xwiishow.c -Wall -O0 -g -L../ -lxwiimote -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
xwiidump: xwiidump.c
- gcc -o xwiidump xwiidump.c -Wall -O0 -g
+ $(CC) -o xwiidump xwiidump.c -Wall -O0 -g $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
../libxwiimote.so:
@echo Making library

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="fakeroot"
PKG_VERSION="1.18"
PKG_VERSION="1.18.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL3"

View File

@ -1,7 +1,11 @@
Section "ServerLayout"
Identifier "aticonfig Layout"
Screen 0 "screen" 0 0
EndSection
Section "Device"
Identifier "fglrx"
Driver "fglrx"
Option "HWCursor" "false"
EndSection
@ -14,7 +18,7 @@ Section "Screen"
Device "fglrx"
DefaultDepth 24
SubSection "Display"
Depth 24
Depth 24
EndSubSection
EndSection

View File

@ -1763,7 +1763,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1721,7 +1721,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1909,7 +1909,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1906,7 +1906,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1770,7 +1770,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1720,7 +1720,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1811,7 +1811,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set

View File

@ -1765,7 +1765,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
# CONFIG_VIDEO_SAA7164 is not set
CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set