瀏覽代碼

fix xbmc youtube addon, now plays fine. python2-sqlite needed, and bios param start_x=1

Waldemar Brodkorb 10 年之前
父節點
當前提交
5edfb8067e

+ 2 - 2
package/bcm2835-firmware/Makefile

@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-firmware
 # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0de84bd4fe70b7767026aef5313dd868
+PKG_MD5SUM:=		e4c1b8f3dd13ae8742a7831c19d212b0
 PKG_DESCR:=		firmware for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/

+ 1 - 1
package/dbus-glib/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		ad0920c7e3aad669163bb59171cf138e
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		dbus glib
+PKG_DEPENDS:=		libdbus glib
 PKG_BUILDDEP:=		dbus glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-glib/

+ 20 - 11
package/dbus/Makefile

@@ -5,23 +5,30 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
 PKG_VERSION:=		1.6.18
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b02e9c95027a416987b81f9893831061
-PKG_DESCR:=		DBUS library and daemon
-PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat libx11 libuuid
-PKG_BUILDDEP:=		expat libX11 util-linux
+PKG_DESCR:=		DBUS daemon
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		libdbus
+PKG_BUILDDEP:=		expat util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+PKG_LIBNAME:=		libdbus
 PKG_OPTS:=		dev
 
+PKG_SUBPKGS:=		DBUS LIBDBUS
+PKGSD_LIBDBUS:=		DBUS library
+PKGSC_LIBDBUS:=		libs
+PKGSS_LIBDBUS:=		libexpat libuuid
+
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libonly
+PKG_OPTS+=		libmix
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
@@ -35,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-tests \
 			--disable-kqueue \
 			--disable-systemd \
 			--disable-xml-docs \
-			--with-x \
+			--without-x \
 			--disable-doxygen-docs
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
@@ -44,13 +51,16 @@ pre-install:
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
 		$(STAGING_DIR)/usr/include/dbus-1.0/dbus
 
+libdbus-install:
+	${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_LIBDBUS}/usr/lib
+
 dbus-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
+	${INSTALL_DIR} ${IDIR_DBUS}/etc \
 		${IDIR_DBUS}/usr/bin ${IDIR_DBUS}/usr/libexec
 	${INSTALL_BIN} ${WRKINST}/usr/libexec/dbus-daemon-launch-helper \
 		${IDIR_DBUS}/usr/libexec/
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
-	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
@@ -61,5 +71,4 @@ dbus-install:
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
 		$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/omxplayer/Makefile

@@ -11,7 +11,7 @@ PKG_MD5SUM:=		1882cac6032baa59291068af30df1702
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
-PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc dbus xset fbset
+PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc libdbus
 PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
@@ -35,8 +35,8 @@ TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib
 
 omxplayer-install:
 	$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin
-	$(INSTALL_BIN) $(WRKSRC)/omxplayer{,.bin} \
-		$(IDIR_OMXPLAYER)/usr/bin
+	$(INSTALL_BIN) $(WRKSRC)/omxplayer.bin \
+		$(IDIR_OMXPLAYER)/usr/bin/omxplayer
 	$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/
 	$(INSTALL_DATA) $(WRKSRC)/fonts/* \
 		$(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/

+ 0 - 85
package/omxplayer/patches/patch-omxplayer

@@ -1,85 +0,0 @@
---- omxplayer-0.3.orig/omxplayer	2014-01-07 09:24:29.000000000 +0100
-+++ omxplayer-0.3/omxplayer	2014-01-10 17:57:55.229752300 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # OMXPlayer launcher script.
- #
-@@ -13,38 +13,10 @@ else
-     OMXPLAYER_LIBS="$OMXPLAYER_LIBS:/usr/lib/omxplayer"
- fi
- 
--refresh_regex='(|.* )(-r|--refresh)( .*|$)'
--audio_regex='.*\.(mp3|wav|wma|cda|ogg|ogm|aac|ac3|flac)( .*|$)'
--
- fbset_bin=`which fbset`
--xset_bin=`which xset`
--xrefresh_bin=`which xrefresh`
--
--if [ -z $NOREFRESH ] || [ "$NOREFRESH" == "0" ]; then
--    if [[ $@ =~ $refresh_regex ]] && [[ ! $@ =~ $audio_regex ]]; then
--        check_failed=0
--
--        if [ -z $fbset_bin ]; then
--            echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have fbset installed, this can cause black screen when it finishes playing."
--            check_failed=1
--        fi
--
--        if [ ! -z $DISPLAY ]; then
--            if [ -z $xset_bin ] || [ -z $xrefresh_bin ]; then
--                echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have xset and xrefresh installed (x11-xserver-utils package on Debian/Raspbian), this can cause black screen when it finishes playing."
--                check_failed=1
--            fi
--        fi
--
--        if [ "$check_failed" == "1" ]; then
--            read -sn 1 -p "Press any key to continue or Ctrl-C to quit."
--            echo
--        fi
--    fi
--fi
- 
--OMXPLAYER_DBUS_ADDR=`mktemp -t omxplayer-XXXXX`
--OMXPLAYER_DBUS_PID=`mktemp -t omxplayer-XXXXX`
-+OMXPLAYER_DBUS_ADDR=`mktemp`
-+OMXPLAYER_DBUS_PID=`mktemp`
- 
- exec 5> $OMXPLAYER_DBUS_ADDR
- exec 6> $OMXPLAYER_DBUS_PID
-@@ -66,16 +38,7 @@ fi
- rm -f $OMXPLAYER_DBUS_ADDR
- rm -f $OMXPLAYER_DBUS_PID
- 
--if [ ! -z $NOREFRESH ] && [ "$NOREFRESH" == "1" ]; then
--    exit 0
--fi
--
--if [[ $@ =~ $audio_regex ]]; then
--    exit 0
--fi
--
--if [[ $@ =~ $refresh_regex ]]; then
--    if [ ! -z $fbset_bin ]; then
-+if [ ! -z $fbset_bin ]; then
-         DEPTH2=`$fbset_bin | head -3 | tail -1 | cut -d " " -f 10`
- 
-         if [ "$DEPTH2" == "8" ]; then
-@@ -89,16 +52,5 @@ if [[ $@ =~ $refresh_regex ]]; then
- 
-         $fbset_bin -depth $DEPTH1 > /dev/null 2>&1
-         $fbset_bin -depth $DEPTH2 > /dev/null 2>&1
--    fi
--
--    if [ ! -z $xset_bin ] && [ ! -z $xrefresh_bin ]; then
--        if [ -z $DISPLAY ]; then
--            DISPLAY=":0"
--        fi
--
--        $xset_bin -display $DISPLAY -q > /dev/null 2>&1
--        if [ "$?" == "0" ]; then
--            $xrefresh_bin -display $DISPLAY > /dev/null 2>&1
--        fi
--    fi
- fi
-+

+ 3 - 3
package/xbmc/Makefile

@@ -5,18 +5,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
+PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		libbluray libgpg-error libudev
+PKG_DEPENDS+=		libbluray libgpg-error libudev python2-mod-sqlite
 PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug

+ 1 - 1
package/xbmc/files/xbmc.init

@@ -15,7 +15,7 @@ start)
 	xbmc &
 	;;
 stop)
-	kill $(pgrep -f /usr/bin/xbmc)
+	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
 	;;
 restart)
 	sh $0 stop

+ 42 - 0
package/xbmc/patches/002-defaultsutf8.patch

@@ -0,0 +1,42 @@
+diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/English/langinfo.xml	2014-01-14 19:34:44.869490320 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
+diff -Nur "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"
+--- "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml"	2013-12-12 22:47:49.000000000 +0100
++++ "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"	2014-01-14 19:35:02.117560629 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
+diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/German/langinfo.xml	2014-01-14 19:34:20.997392956 +0100
+@@ -2,8 +2,8 @@
+ <language locale="de">
+ 
+   <charsets>
+-    <gui unicodefont="false">CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui unicodefont="false">UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>

+ 1 - 1
target/config/Config.in

@@ -519,7 +519,7 @@ config ADK_TARGET_CFLAGS
 
 config ADK_TARGET_CMDLINE
 	string
-	default "dwc_otg.fiq_split_enable=0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP