xwiimote: update to xwiimote-0b79d97

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-10-07 19:17:38 +02:00
parent 8f719d8b0f
commit d26869853b
4 changed files with 47 additions and 56 deletions

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