diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/libx264/Makefile | 3 | ||||
-rw-r--r-- | package/libx264/patches/patch-Makefile | 11 | ||||
-rw-r--r-- | package/libx264/patches/patch-configure | 8 | ||||
-rw-r--r-- | package/openjdk7/Makefile | 3 | ||||
-rw-r--r-- | package/openjdk7/patches/openadk.patch | 76 | ||||
-rw-r--r-- | package/sdl/Makefile | 6 | ||||
-rw-r--r-- | package/taglib/Makefile | 6 | ||||
-rw-r--r-- | package/xbmc/Makefile | 5 | ||||
-rw-r--r-- | package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp | 17 | ||||
-rw-r--r-- | package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp | 18 | ||||
-rw-r--r-- | package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp | 56 | ||||
-rw-r--r-- | package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h | 45 |
12 files changed, 197 insertions, 57 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 55bd18868..0fce6390e 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libx264 # actually is git checkout from 22.01.2014 PKG_VERSION:= 1.0.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304 PKG_DESCR:= H264 encoding library PKG_SECTION:= libs @@ -24,6 +24,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --disable-asm endif CONFIGURE_ARGS+= --disable-cli \ + --enable-asm \ --cross-prefix=$(TARGET_CROSS) libx264-install: diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile deleted file mode 100644 index cd8a9f198..000000000 --- a/package/libx264/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100 -+++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100 -@@ -117,7 +117,7 @@ endif - - # NEON optims - ifeq ($(ARCH),ARM) --ifneq ($(AS),) -+ifneq ($(ASM),no) - ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ - common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ - common/arm/predict-a.S diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure index ed9d2ed94..09b9f1fff 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -21,11 +21,3 @@ fi if cc_check '' -fno-tree-vectorize ; then -@@ -1147,6 +1147,7 @@ bindir=$bindir - libdir=$libdir - includedir=$includedir - ARCH=$ARCH -+ASM=$asm - SYS=$SYS - CC=$CC - CFLAGS=$CFLAGS diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index ca9e416a5..d96e9ad53 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -102,7 +102,8 @@ OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" + ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ + ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" HOST_STYLE:= auto diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index 75e291e47..d051a0694 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,6 +1,6 @@ diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in ---- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.000000000 +0200 -+++ icedtea-2.3.12/Makefile.in 2014-01-16 08:54:53.000000000 +0100 +--- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.947711693 +0200 ++++ icedtea-2.3.12/Makefile.in 2014-01-31 17:22:30.941371226 +0100 @@ -695,7 +695,7 @@ $(DISTRIBUTION_PATCHES) @@ -21,8 +21,8 @@ diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch --- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.12/patches/openadk.patch 2014-01-16 08:55:05.000000000 +0100 -@@ -0,0 +1,546 @@ ++++ icedtea-2.3.12/patches/openadk.patch 2014-01-31 17:30:37.666672422 +0100 +@@ -0,0 +1,562 @@ +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100 @@ -516,32 +516,6 @@ diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/opena + + ifndef JDK_TOPDIR + JDK_TOPDIR=$(TOPDIR)/jdk -+diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make -+--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200 -++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-14 21:28:27.000000000 +0100 -+@@ -285,7 +285,7 @@ -+ LIBS_VM += $(LIBS) -+ endif -+ ifeq ($(ZERO_BUILD), true) -+- LIBS_VM += $(LIBFFI_LIBS) -++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+ endif -+ ifeq ($(SHARK_BUILD), true) -+ LFLAGS_VM += $(LLVM_LDFLAGS) -+diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile -+--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200 -++++ openjdk-boot/Makefile 2014-01-13 22:15:04.000000000 +0100 -+@@ -53,9 +53,7 @@ -+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) -+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) -+ -+-ifndef TOPDIR -+- TOPDIR:=. -+-endif -++TOPDIR:=. -+ -+ ifndef JDK_TOPDIR -+ JDK_TOPDIR=$(TOPDIR)/jdk +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2013-07-26 12:31:42.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-01-16 08:45:53.000000000 +0100 @@ -569,3 +543,45 @@ diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/opena + + endif + ++diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make ++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200 +++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-31 17:29:43.410522729 +0100 ++@@ -285,7 +285,7 @@ ++ LIBS_VM += $(LIBS) ++ endif ++ ifeq ($(ZERO_BUILD), true) ++- LIBS_VM += $(LIBFFI_LIBS) +++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic ++ endif ++ ifeq ($(SHARK_BUILD), true) ++ LFLAGS_VM += $(LLVM_LDFLAGS) ++diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk ++--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2013-07-25 18:10:09.000000000 +0200 +++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2014-01-31 17:29:54.942555812 +0100 ++@@ -269,12 +269,6 @@ ++ endif # !HEADLESS ++ endif # PLATFORM ++ ++-ifeq ($(PLATFORM), linux) ++- # Checking for the X11/extensions headers at the additional location ++- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ ++- $(wildcard /usr/include/X11/extensions)) ++-endif ++- ++ ifeq ($(PLATFORM), macosx)) ++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ ++ -I$(OPENWIN_HOME)/include ++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile ++--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200 +++++ openjdk-boot/Makefile 2014-01-31 17:29:43.410522729 +0100 ++@@ -53,9 +53,7 @@ ++ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) ++ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) ++ ++-ifndef TOPDIR ++- TOPDIR:=. ++-endif +++TOPDIR:=. ++ ++ ifndef JDK_TOPDIR ++ JDK_TOPDIR=$(TOPDIR)/jdk diff --git a/package/sdl/Makefile b/package/sdl/Makefile index bf6f4d06d..7510c02ba 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sdl PKG_VERSION:= 1.2.14 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs @@ -32,12 +32,14 @@ $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --without-x \ + --enable-shared \ --disable-cdrom \ --disable-joystick \ --disable-audio \ --disable-video \ --disable-assembly \ - --disable-shared \ + --disable-input-tslib \ + --disable-video-directfb \ --disable-video-cocoa \ --disable-video-opengl diff --git a/package/taglib/Makefile b/package/taglib/Makefile index 402b89c7f..9f323fc54 100644 --- a/package/taglib/Makefile +++ b/package/taglib/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= taglib -PKG_VERSION:= 1.8 +PKG_VERSION:= 1.9.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= dcb8bd1b756f2843e18b1fdf3aaeee15 +PKG_MD5SUM:= 0d35df96822bbd564c5504cb3c2e4d86 PKG_DESCR:= Audio Meta-Data library PKG_SECTION:= libs PKG_DEPENDS:= zlib PKG_BUILDDEP:= cmake-host zlib PKG_URL:= http://taglib.github.com/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= http://taglib.github.io/releases/ PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 05026e12b..a4dd831c7 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xbmc PKG_VERSION:= 12.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb PKG_DESCR:= software media player PKG_SECTION:= multimedia @@ -58,6 +58,9 @@ CONFIGURE_ENV+= DESTDIR='${WRKINST}' \ TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr' CONFIGURE_ARGS+= --disable-optical-drive \ --disable-mysql \ + --enable-mid \ + --enable-libmp3lame \ + --enable-libvorbisenc \ --enable-samba \ --enable-ssh \ --enable-nfs \ diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp new file mode 100644 index 000000000..a8f2af5d8 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp @@ -0,0 +1,17 @@ +--- xbmc-12.3-Frodo.orig/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/xbmc/cores/dvdplayer/DVDPlayer.cpp 2014-01-31 17:45:02.259066528 +0100 +@@ -2897,6 +2897,14 @@ bool CDVDPlayer::OpenVideoStream(int iSt + if(m_CurrentVideo.id < 0 + || m_CurrentVideo.hint != hint) + { ++ // For audio files, don't open (M)JPEG artwork as video ++ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG) ++ { ++ CLog::Log(LOGINFO, "%s - Ignoring video (art) in audio file %s", __FUNCTION__, m_filename.c_str()); ++ pStream->disabled = true; ++ pStream->SetDiscard(AVDISCARD_ALL); ++ return false; ++ } + if (!m_dvdPlayerVideo.OpenStream(hint)) + { + /* mark stream as disabled, to disallaw further attempts */ diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp new file mode 100644 index 000000000..c519df088 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp @@ -0,0 +1,18 @@ +--- xbmc-12.3-Frodo.orig/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/xbmc/cores/omxplayer/OMXPlayer.cpp 2014-01-31 18:05:09.353171156 +0100 +@@ -3007,7 +3007,14 @@ bool COMXPlayer::OpenVideoStream(int iSt + if(m_CurrentVideo.id < 0 + || m_CurrentVideo.hint != hint) + { +- if (!m_player_video.OpenStream(hint)) ++ // for music file, don't open artwork as video ++ bool disabled = false; ++ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG) ++ { ++ CLog::Log(LOGINFO, "%s - Ignoring video in audio filetype:%s", __FUNCTION__, m_filename.c_str()); ++ disabled = true; ++ } ++ if (disabled || !m_player_video.OpenStream(hint)) + { + /* mark stream as disabled, to disallaw further attempts */ + CLog::Log(LOGWARNING, "%s - Unsupported stream %d. Stream disabled.", __FUNCTION__, iStream); diff --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp new file mode 100644 index 000000000..4b8b25efb --- /dev/null +++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2014 Team XBMC + * http://www.xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#if defined (_LINUX) + +#include <stdlib.h> +#include "LinuxPowerSyscall.h" +#include "utils/log.h" + +CLinuxPowerSyscall::CLinuxPowerSyscall() +{ + CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall"); +} + +CLinuxPowerSyscall::~CLinuxPowerSyscall() +{ } + +bool CLinuxPowerSyscall::Powerdown() +{ + system("/sbin/poweroff -F"); + return 0; +} + +bool CLinuxPowerSyscall::Reboot() +{ + system("/sbin/reboot -F"); + return 0; +} + +int CLinuxPowerSyscall::BatteryLevel(void) +{ } + +bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) +{ + return true; +} + +#endif + diff --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h new file mode 100644 index 000000000..959a8119b --- /dev/null +++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h @@ -0,0 +1,45 @@ +#pragma once +/* + * Copyright (C) 2014 Team XBMC + * http://www.xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#if defined (_LINUX) +#include "powermanagement/IPowerSyscall.h" + +class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents +{ +public: + CLinuxPowerSyscall(); + ~CLinuxPowerSyscall(); + + virtual bool Powerdown(); + virtual bool Suspend(void) { return false; } + virtual bool Hibernate(void) { return false; } + virtual bool Reboot(); + + virtual bool CanPowerdown(void) { return true; } + virtual bool CanSuspend(void) { return false; } + virtual bool CanHibernate(void) { return false; } + virtual bool CanReboot(void) { return true; } + virtual int BatteryLevel(void); + + virtual bool PumpPowerEvents(IPowerEventsCallback *callback); +}; +#endif + |