From 8f16335443a322578274737c8d80ce557e4d2656 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Aug 2013 10:30:50 +0200 Subject: add xmbc package for raspberry-pi target --- package/MesaLib/Makefile | 2 +- package/bcm2835-vc/Makefile | 4 +- package/bzip2/Makefile | 18 +++++- package/bzip2/patches/patch-Makefile-libbz2_so | 15 +++++ package/fribidi/Makefile | 26 +++++++++ package/libXt/Makefile | 1 + package/libass/Makefile | 28 ++++++++++ package/libcdio/Makefile | 24 ++++++++ package/libglew/Makefile | 32 +++++++++++ package/libglew/patches/patch-Makefile | 12 ++++ package/libglew/patches/patch-Makefile.orig | 11 ++++ .../libglew/patches/patch-config_Makefile_linux | 26 +++++++++ .../patches/patch-config_Makefile_linux.orig | 26 +++++++++ package/libjasper/Makefile | 27 +++++++++ package/libmicrohttpd/Makefile | 28 ++++++++++ package/libmodplug/Makefile | 24 ++++++++ package/libmpeg2/Makefile | 26 +++++++++ package/mesa-demos/Makefile | 29 ++++++++++ package/pcre/Makefile | 9 ++- package/taglib/Makefile | 34 +++++++++++ package/taglib/files/taglib.pc | 11 ++++ package/taglib/patches/patch-taglib_pc_cmake | 19 +++++++ package/taglib/patches/patch-taglib_pc_cmake.orig | 19 +++++++ package/tinyxml/Makefile | 32 +++++++++++ package/tinyxml/patches/patch-Makefile | 61 ++++++++++++++++++++ package/tinyxml/patches/patch-Makefile.orig | 60 ++++++++++++++++++++ package/xbmc/Makefile | 65 ++++++++++++++++++++++ package/xbmc/patches/patch-Makefile_include_in | 10 ++++ package/xbmc/patches/patch-configure | 11 ++++ package/xbmc/patches/patch-lib_DllAvCodec_h | 35 ++++++++++++ package/xbmc/patches/patch-lib_DllAvFilter_h | 46 +++++++++++++++ package/xbmc/patches/patch-tools_Linux_xbmc_sh_in | 15 +++++ .../patches/patch-tools_TexturePacker_XBMCTex_cpp | 17 ++++++ .../patch-tools_TexturePacker_XBTFWriter_cpp | 13 +++++ .../patch-tools_TexturePacker_cmdlineargs_h | 11 ++++ .../patches/patch-tools_TexturePacker_xwinapi_h | 11 ++++ .../xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h | 11 ++++ ..._cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp | 11 ++++ ...mc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h | 20 +++++++ ...h-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h | 15 +++++ .../patch-xbmc_cores_dvdplayer_DVDAudio_cpp | 11 ++++ .../patches/patch-xbmc_cores_dvdplayer_DVDAudio_h | 20 +++++++ ...dplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp | 11 ++++ ...s_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h | 17 ++++++ ...VDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h | 20 +++++++ ..._dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp | 11 ++++ ...es_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h | 11 ++++ ...atch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h | 11 ++++ ...yer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp | 11 ++++ ...dplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp | 28 ++++++++++ ..._cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp | 11 ++++ ...res_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp | 47 ++++++++++++++++ ...tch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h | 29 ++++++++++ .../patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h | 11 ++++ .../patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h | 11 ++++ .../patch-xbmc_cores_dvdplayer_DVDStreamInfo_h | 20 +++++++ ...patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp | 10 ++++ .../patch-xbmc_cores_omxplayer_OMXAudio_cpp | 11 ++++ .../patches/patch-xbmc_cores_omxplayer_OMXAudio_h | 11 ++++ .../patch-xbmc_cores_omxplayer_OMXVideo_cpp | 11 ++++ .../patches/patch-xbmc_cores_omxplayer_OMXVideo_h | 11 ++++ .../patch-xbmc_utils_BitstreamConverter_cpp | 11 ++++ .../patches/patch-xbmc_utils_BitstreamConverter_h | 20 +++++++ package/xbmc/patches/patch-xbmc_utils_EndianSwap_h | 11 ++++ package/xdpyinfo/Makefile | 26 +++++++++ package/yajl/Makefile | 29 ++++++++++ package/yajl/patches/patch-CMakeLists_txt | 19 +++++++ package/yajl/patches/patch-CMakeLists_txt.orig | 14 +++++ package/yajl/patches/patch-configure | 11 ++++ 69 files changed, 1365 insertions(+), 5 deletions(-) create mode 100644 package/bzip2/patches/patch-Makefile-libbz2_so create mode 100644 package/fribidi/Makefile create mode 100644 package/libass/Makefile create mode 100644 package/libcdio/Makefile create mode 100644 package/libglew/Makefile create mode 100644 package/libglew/patches/patch-Makefile create mode 100644 package/libglew/patches/patch-Makefile.orig create mode 100644 package/libglew/patches/patch-config_Makefile_linux create mode 100644 package/libglew/patches/patch-config_Makefile_linux.orig create mode 100644 package/libjasper/Makefile create mode 100644 package/libmicrohttpd/Makefile create mode 100644 package/libmodplug/Makefile create mode 100644 package/libmpeg2/Makefile create mode 100644 package/mesa-demos/Makefile create mode 100644 package/taglib/Makefile create mode 100644 package/taglib/files/taglib.pc create mode 100644 package/taglib/patches/patch-taglib_pc_cmake create mode 100644 package/taglib/patches/patch-taglib_pc_cmake.orig create mode 100644 package/tinyxml/Makefile create mode 100644 package/tinyxml/patches/patch-Makefile create mode 100644 package/tinyxml/patches/patch-Makefile.orig create mode 100644 package/xbmc/Makefile create mode 100644 package/xbmc/patches/patch-Makefile_include_in create mode 100644 package/xbmc/patches/patch-configure create mode 100644 package/xbmc/patches/patch-lib_DllAvCodec_h create mode 100644 package/xbmc/patches/patch-lib_DllAvFilter_h create mode 100644 package/xbmc/patches/patch-tools_Linux_xbmc_sh_in create mode 100644 package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp create mode 100644 package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp create mode 100644 package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h create mode 100644 package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h create mode 100644 package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h create mode 100644 package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp create mode 100644 package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h create mode 100644 package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp create mode 100644 package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h create mode 100644 package/xbmc/patches/patch-xbmc_utils_EndianSwap_h create mode 100644 package/xdpyinfo/Makefile create mode 100644 package/yajl/Makefile create mode 100644 package/yajl/patches/patch-CMakeLists_txt create mode 100644 package/yajl/patches/patch-CMakeLists_txt.orig create mode 100644 package/yajl/patches/patch-configure (limited to 'package') diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index c55aa1db1..d62773bd3 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -20,7 +20,7 @@ PKG_SUBPKGS:= MESALIB MESALIB_DEV PKGSD_MESALIB_DEV:= MESA headers PKGSC_MESALIB_DEV:= devel -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index aa462ce8a..bf78120a8 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-vc PKG_VERSION:= 0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= d16840805c020af92cd2268a0291228b PKG_DESCR:= vc tools for raspberry pi (bcm2835) PKG_SECTION:= base @@ -26,6 +26,8 @@ INSTALL_STYLE:= manual bcm2835-vc-install: ${CP} ${WRKBUILD}/* ${IDIR_BCM2835_VC} + # required for xbmc + (cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1) -rm -rf ${IDIR_BCM2835_VC}/opt/vc/include mkdir -p ${STAGING_DIR}/opt/vc ${CP} ${WRKBUILD}/opt/vc/lib ${STAGING_DIR}/opt/vc diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 9bcb61af5..b2ed92985 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -9,19 +9,35 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 00b516f4704d4a7cb50a1d97e6e8e15b PKG_DESCR:= bzip2 compression utility PKG_SECTION:= archive +PKG_DEPENDS:= libbz2 PKG_URL:= http://www.bzip.org/ PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/ +PKG_SUBPKGS:= BZIP2 LIBBZ2 + +PKGSD_LIBBZ2:= bzip2 compression library +PKGSC_LIBBZ2:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2})) +MAKE_FILE:= Makefile-libbz2_so CONFIG_STYLE:= manual TARGET_CFLAGS+= -fPIC XAKE_FLAGS+= PREFIX=${WRKINST}/usr +INSTALL_STYLE:= manual + +libbz2-install: + ${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib + $(CP) ${WRKBUILD}/libbz2.so* \ + ${IDIR_LIBBZ2}/usr/lib + $(CP) ${WRKBUILD}/libbz2.so* \ + ${STAGING_DIR}/usr/lib + (cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) bzip2-install: ${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/bzip2 ${IDIR_BZIP2}/usr/bin + ${INSTALL_BIN} ${WRKBUILD}/bzip2-shared ${IDIR_BZIP2}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so new file mode 100644 index 000000000..e71dab136 --- /dev/null +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -0,0 +1,15 @@ +--- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 ++++ bzip2-1.0.6/Makefile-libbz2_so 2013-07-30 14:15:29.000000000 +0200 +@@ -22,9 +22,10 @@ + + + SHELL=/bin/sh +-CC=gcc ++CC?=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS?= ++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) + + OBJS= blocksort.o \ + huffman.o \ diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile new file mode 100644 index 000000000..9ec9569dd --- /dev/null +++ b/package/fribidi/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= fribidi +PKG_VERSION:= 0.19.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 925bafb97afee8a2fc2d0470c072a155 +PKG_DESCR:= Unicode Bidirectional Algorithm +PKG_SECTION:= libs +PKG_URL:= http://www.fribidi.org/ +PKG_SITES:= http://fribidi.org/download/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +fribidi-install: + $(INSTALL_DIR) $(IDIR_FRIBIDI)/usr/lib + $(CP) $(WRKINST)/usr/lib/libfribidi*.so* \ + $(IDIR_FRIBIDI)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXt/Makefile b/package/libXt/Makefile index e649b5960..7f5004c24 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs +PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb PKG_BUILDDEP:= libSM libX11 kbproto PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/libass/Makefile b/package/libass/Makefile new file mode 100644 index 000000000..044355051 --- /dev/null +++ b/package/libass/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libass +PKG_VERSION:= 0.10.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0f54b1f3a24fa897ebbbcc5bc744b32a +PKG_DESCR:= a portable subtitle renderer for the ASS/SSA format +PKG_SECTION:= libs +PKG_DEPENDS:= fribidi fontconfig +PKG_BUILDDEP:= fribidi fontconfig +PKG_URL:= http://code.google.com/p/libass/ +PKG_SITES:= http://libass.googlecode.com/files/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBASS,libass,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libass-install: + $(INSTALL_DIR) $(IDIR_LIBASS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libass*.so* \ + $(IDIR_LIBASS)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile new file mode 100644 index 000000000..fb2049618 --- /dev/null +++ b/package/libcdio/Makefile @@ -0,0 +1,24 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libcdio +PKG_VERSION:= 0.90 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1b245b023fb03a58d030fd2800db3247 +PKG_DESCR:= a library for CD-ROM and CD image access +PKG_SECTION:= libs +PKG_URL:= http://www.gnu.org/software/libcdio +PKG_SITES:= ${MASTER_SITE_GNU:=libcdio/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCDIO,libcdio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libcdio-install: + $(INSTALL_DIR) $(IDIR_LIBCDIO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcdio*.so* \ + $(IDIR_LIBCDIO)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libglew/Makefile b/package/libglew/Makefile new file mode 100644 index 000000000..0cfa8ec48 --- /dev/null +++ b/package/libglew/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libglew +PKG_VERSION:= 1.10.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2f09e5e6cb1b9f3611bcac79bc9c2d5d +PKG_DESCR:= OpenGL Extension Wrangler Library (GLEW) +PKG_SECTION:= libs +PKG_DEPENDS:= libx11 libxmu libxi libxext +PKG_BUILDDEP:= libX11 libXmu libXi libXext +PKG_URL:= http://glew.sourceforge.net/index.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=glew/} + +DISTFILES:= glew-$(PKG_VERSION).tgz +WRKDIST= ${WRKDIR}/glew-$(PKG_VERSION) + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' + +libglew-install: + $(INSTALL_DIR) $(IDIR_LIBGLEW)/usr/lib + $(CP) $(WRKINST)/usr/lib/libGLEW.so* \ + $(IDIR_LIBGLEW)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libglew/patches/patch-Makefile b/package/libglew/patches/patch-Makefile new file mode 100644 index 000000000..9223c9ae8 --- /dev/null +++ b/package/libglew/patches/patch-Makefile @@ -0,0 +1,12 @@ +--- glew-1.10.0.orig/Makefile 2013-07-22 16:11:22.000000000 +0200 ++++ glew-1.10.0/Makefile 2013-07-30 13:16:20.000000000 +0200 +@@ -71,7 +71,8 @@ else + OPT = $(POPT) + endif + INCLUDE = -Iinclude +-CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) ++CFLAGS ?= $(OPT) $(WARN) $(CFLAGS.EXTRA) ++CFLAGS += $(INCLUDE) + + all debug: glew.lib glew.lib.mx glew.bin + diff --git a/package/libglew/patches/patch-Makefile.orig b/package/libglew/patches/patch-Makefile.orig new file mode 100644 index 000000000..c31216b42 --- /dev/null +++ b/package/libglew/patches/patch-Makefile.orig @@ -0,0 +1,11 @@ +--- glew-1.10.0.orig/Makefile 2013-07-22 16:11:22.000000000 +0200 ++++ glew-1.10.0/Makefile 2013-07-30 13:15:41.000000000 +0200 +@@ -71,7 +71,7 @@ else + OPT = $(POPT) + endif + INCLUDE = -Iinclude +-CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) ++CFLAGS ?= $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) + + all debug: glew.lib glew.lib.mx glew.bin + diff --git a/package/libglew/patches/patch-config_Makefile_linux b/package/libglew/patches/patch-config_Makefile_linux new file mode 100644 index 000000000..7b810c7b3 --- /dev/null +++ b/package/libglew/patches/patch-config_Makefile_linux @@ -0,0 +1,26 @@ +--- glew-1.10.0.orig/config/Makefile.linux 2013-07-22 16:11:22.000000000 +0200 ++++ glew-1.10.0/config/Makefile.linux 2013-07-30 13:17:09.000000000 +0200 +@@ -1,21 +1,7 @@ + NAME = $(GLEW_NAME) +-CC = cc +-LD = cc ++CC ?= cc ++LD = $(CC) + M_ARCH ?= $(shell uname -m) +-ARCH64 = false +-ifeq (x86_64,${M_ARCH}) +- ARCH64 = true +-endif +-ifeq (ppc64,${M_ARCH}) +- ARCH64 = true +-endif +-ifeq (${ARCH64},true) +- LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 +- LIBDIR = $(GLEW_DEST)/lib64 +-else +- LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib +- LIBDIR = $(GLEW_DEST)/lib +-endif + LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic diff --git a/package/libglew/patches/patch-config_Makefile_linux.orig b/package/libglew/patches/patch-config_Makefile_linux.orig new file mode 100644 index 000000000..75adbb36e --- /dev/null +++ b/package/libglew/patches/patch-config_Makefile_linux.orig @@ -0,0 +1,26 @@ +--- glew-1.10.0.orig/config/Makefile.linux 2013-07-22 16:11:22.000000000 +0200 ++++ glew-1.10.0/config/Makefile.linux 2013-07-30 13:14:42.000000000 +0200 +@@ -1,21 +1,7 @@ + NAME = $(GLEW_NAME) +-CC = cc +-LD = cc ++CC ?= cc ++LD ?= cc + M_ARCH ?= $(shell uname -m) +-ARCH64 = false +-ifeq (x86_64,${M_ARCH}) +- ARCH64 = true +-endif +-ifeq (ppc64,${M_ARCH}) +- ARCH64 = true +-endif +-ifeq (${ARCH64},true) +- LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 +- LIBDIR = $(GLEW_DEST)/lib64 +-else +- LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib +- LIBDIR = $(GLEW_DEST)/lib +-endif + LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 + LDFLAGS.STATIC = -Wl,-Bstatic + LDFLAGS.DYNAMIC = -Wl,-Bdynamic diff --git a/package/libjasper/Makefile b/package/libjasper/Makefile new file mode 100644 index 000000000..ad95d89d6 --- /dev/null +++ b/package/libjasper/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libjasper +PKG_VERSION:= 1.900 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a342b2b4495b3e1394e161eb5d85d754 +PKG_DESCR:= implementation of the codec specified in the JPEG-2000 Part-1 standard +PKG_SECTION:= libs +PKG_URL:= http://www.ece.uvic.ca/~frodo/jasper/ +PKG_SITES:= http://www.ece.uvic.ca/~frodo/jasper/software/ + +DISTFILES:= jasper-${PKG_VERSION}.1.zip +WRKDIST= ${WRKDIR}/jasper-$(PKG_VERSION).1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBJASPER,libjasper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libjasper-install: + $(INSTALL_DIR) $(IDIR_LIBJASPER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjasper*.so* \ + $(IDIR_LIBJASPER)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile new file mode 100644 index 000000000..1f8d7734b --- /dev/null +++ b/package/libmicrohttpd/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libmicrohttpd +PKG_VERSION:= 0.9.26 +PKG_RELEASE:= 1 +PKG_MD5SUM:= bdac9b62fa3080890f9ab44cf29749fc +PKG_DESCR:= a C library make it easy to run an HTTP server +PKG_SECTION:= libs +PKG_DEPENDS:= libgcrypt +PKG_BUILDDEP:= libgcrypt +PKG_URL:= http://www.gnu.org/software/libmicrohttpd/ +PKG_SITES:= ${MASTER_SITE_GNU:=libmicrohttpd/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_DIR)/usr + +libmicrohttpd-install: + $(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmicrohttpd*.so* \ + $(IDIR_LIBMICROHTTPD)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libmodplug/Makefile b/package/libmodplug/Makefile new file mode 100644 index 000000000..4a4c533df --- /dev/null +++ b/package/libmodplug/Makefile @@ -0,0 +1,24 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libmodplug +PKG_VERSION:= 0.8.8.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fddc3c704c5489de2a3cf0fedfec59db +PKG_DESCR:= a MOD player library +PKG_SECTION:= libs +PKG_URL:= http://modplug-xmms.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.4/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBMODPLUG,libmodplug,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libmodplug-install: + $(INSTALL_DIR) $(IDIR_LIBMODPLUG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmodplug*.so* \ + $(IDIR_LIBMODPLUG)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libmpeg2/Makefile b/package/libmpeg2/Makefile new file mode 100644 index 000000000..f10a34f34 --- /dev/null +++ b/package/libmpeg2/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libmpeg2 +PKG_VERSION:= 0.5.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0f92c7454e58379b4a5a378485bbd8ef +PKG_DESCR:= MPEG-1 & -2 decoding library +PKG_SECTION:= libs +PKG_URL:= http://libmpeg2.sourceforge.net/ +PKG_SITES:= http://libmpeg2.sourceforge.net/files/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBMPEG2,libmpeg2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-sdl + +libmpeg2-install: + $(INSTALL_DIR) $(IDIR_LIBMPEG2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmpeg2*.so* \ + $(IDIR_LIBMPEG2)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mesa-demos/Makefile b/package/mesa-demos/Makefile new file mode 100644 index 000000000..65506f4e7 --- /dev/null +++ b/package/mesa-demos/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= mesa-demos +PKG_VERSION:= 8.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4049d98dd4131212e2842b770f1b0fa5 +PKG_DESCR:= MESA demo apps +PKG_SECTION:= misc +PKG_DEPENDS:= mesalib +PKG_BUILDDEP:= MesaLib +PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/ + +PKG_SUBPKGS:= GLXINFO +PKGSD_GLXINFO:= glxinfo +PKGSS_GLXINFO:= libxt libxau libxdmcp libxcb libx11 libxext libglew + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +glxinfo-install: + $(INSTALL_DIR) $(IDIR_GLXINFO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/glxinfo \ + $(IDIR_GLXINFO)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 5638f8967..3ff017f6e 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -12,22 +12,27 @@ PKG_SECTION:= libs PKG_URL:= http://www.pcre.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} -PKG_SUBPKGS:= LIBPCRE LIBPCRE_DEV +PKG_SUBPKGS:= LIBPCRE LIBPCRE_DEV LIBPCRECPP PKGSD_LIBPCRE_DEV:= PCRE headers PKGSC_LIBPCRE_DEV:= devel +PKGSD_LIBPCRECPP:= PCRE c++ library include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-cpp XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} libpcre-install: ${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib +libpcrecpp-install: + ${INSTALL_DIR} ${IDIR_LIBPCRECPP}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpcrecpp.so* ${IDIR_LIBPCRECPP}/usr/lib + libpcre-dev-install: ${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/include ${CP} ${WRKINST}/usr/include/*.h \ diff --git a/package/taglib/Makefile b/package/taglib/Makefile new file mode 100644 index 000000000..9494d94d2 --- /dev/null +++ b/package/taglib/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= taglib +PKG_VERSION:= 1.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= dcb8bd1b756f2843e18b1fdf3aaeee15 +PKG_DESCR:= Audio Meta-Data library +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_BUILDDEP:= zlib +PKG_URL:= http://taglib.github.com/ +PKG_SITES:= http://taglib.github.io/releases/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual + +do-configure: + (cd ${WRKBUILD} && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .) + +pre-install: + $(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/ + +taglib-install: + $(INSTALL_DIR) $(IDIR_TAGLIB)/usr/lib + $(CP) $(WRKINST)/usr/lib/libtag*.so* \ + $(IDIR_TAGLIB)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/taglib/files/taglib.pc b/package/taglib/files/taglib.pc new file mode 100644 index 000000000..788eed37d --- /dev/null +++ b/package/taglib/files/taglib.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: TagLib +Description: Audio meta-data library +Requires: +Version: 1.8.0 +Libs: -L${libdir} -ltag +Cflags: -I${includedir}/taglib diff --git a/package/taglib/patches/patch-taglib_pc_cmake b/package/taglib/patches/patch-taglib_pc_cmake new file mode 100644 index 000000000..fa0b43e58 --- /dev/null +++ b/package/taglib/patches/patch-taglib_pc_cmake @@ -0,0 +1,19 @@ +--- taglib-1.8.orig/taglib.pc.cmake 2012-09-06 20:03:15.000000000 +0200 ++++ taglib-1.8/taglib.pc.cmake 2013-07-31 11:57:48.000000000 +0200 +@@ -1,11 +1,11 @@ + prefix=${CMAKE_INSTALL_PREFIX} +-exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${LIB_INSTALL_DIR} +-includedir=${INCLUDE_INSTALL_DIR} ++exec_prefix=\${prefix} ++libdir=\${prefix}/lib ++includedir=\${prefix}/include + + Name: TagLib + Description: Audio meta-data library + Requires: + Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} +-Libs: -L${LIB_INSTALL_DIR} -ltag +-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib ++Libs: -L\${libdir} -ltag ++Cflags: -I\${includedir}/taglib diff --git a/package/taglib/patches/patch-taglib_pc_cmake.orig b/package/taglib/patches/patch-taglib_pc_cmake.orig new file mode 100644 index 000000000..b626622b1 --- /dev/null +++ b/package/taglib/patches/patch-taglib_pc_cmake.orig @@ -0,0 +1,19 @@ +--- taglib-1.8.orig/taglib.pc.cmake 2012-09-06 20:03:15.000000000 +0200 ++++ taglib-1.8/taglib.pc.cmake 2013-07-31 11:54:55.000000000 +0200 +@@ -1,11 +1,11 @@ + prefix=${CMAKE_INSTALL_PREFIX} +-exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${LIB_INSTALL_DIR} +-includedir=${INCLUDE_INSTALL_DIR} ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: TagLib + Description: Audio meta-data library + Requires: + Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} +-Libs: -L${LIB_INSTALL_DIR} -ltag +-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib ++Libs: -L${libdir} -ltag ++Cflags: -I${includedir}/taglib diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile new file mode 100644 index 000000000..3875bf225 --- /dev/null +++ b/package/tinyxml/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= tinyxml +PKG_VERSION:= 2.6.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2a0aaf609c9e670ec9748cd01ed52dae +PKG_DESCR:= a simple, small, minimal, C++ XML parser +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/tinyxml/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tinyxml/} + +DISTFILES:= ${PKG_NAME}_2_6_2.zip +WRKDIST= ${WRKDIR}/tinyxml + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TINYXML,tinyxml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +tinyxml-install: + $(INSTALL_DIR) $(IDIR_TINYXML)/usr/lib + $(CP) $(WRKBUILD)/libtinyxml*.so* \ + $(IDIR_TINYXML)/usr/lib + $(INSTALL_DATA) $(WRKBUILD)/tiny{str,xml}.h \ + $(STAGING_DIR)/usr/include + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tinyxml/patches/patch-Makefile b/package/tinyxml/patches/patch-Makefile new file mode 100644 index 000000000..bfe7abb95 --- /dev/null +++ b/package/tinyxml/patches/patch-Makefile @@ -0,0 +1,61 @@ +--- tinyxml.orig/Makefile 2013-07-30 15:47:47.000000000 +0200 ++++ tinyxml/Makefile 2013-07-30 15:47:46.000000000 +0200 +@@ -15,13 +15,13 @@ PROFILE := NO + + # TINYXML_USE_STL can be used to turn on STL support. NO, then STL + # will not be used. YES will include the STL files. +-TINYXML_USE_STL := NO ++TINYXML_USE_STL := YES + + #**************************************************************************** + +-CC := gcc +-CXX := g++ +-LD := g++ ++CC ?= gcc ++CXX ?= g++ ++LD := $(CXX) + AR := ar rc + RANLIB := ranlib + +@@ -41,9 +41,9 @@ ifeq (YES, ${DEBUG}) + CXXFLAGS := ${DEBUG_CXXFLAGS} + LDFLAGS := ${DEBUG_LDFLAGS} + else +- CFLAGS := ${RELEASE_CFLAGS} +- CXXFLAGS := ${RELEASE_CXXFLAGS} +- LDFLAGS := ${RELEASE_LDFLAGS} ++ CFLAGS ?= ${RELEASE_CFLAGS} ++ CXXFLAGS ?= ${RELEASE_CXXFLAGS} ++ LDFLAGS ?= ${RELEASE_LDFLAGS} + endif + + ifeq (YES, ${PROFILE}) +@@ -81,7 +81,7 @@ CXXFLAGS := ${CXXFLAGS} ${DEFS} + # Targets of the build + #**************************************************************************** + +-OUTPUT := xmltest ++OUTPUT := libtinyxml.so.2.6.2 + + all: ${OUTPUT} + +@@ -90,7 +90,7 @@ all: ${OUTPUT} + # Source files + #**************************************************************************** + +-SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp ++SRCS := tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp + + # Add on the sources for libraries + SRCS := ${SRCS} +@@ -102,7 +102,8 @@ OBJS := $(addsuffix .o,$(basename ${SRCS + #**************************************************************************** + + ${OUTPUT}: ${OBJS} +- ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} ++ ${CXX} -shared -Wl,-soname,libtinyxml.so.2.6.2 -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${EXTRA_LIBS} ++ ln -sf libtinyxml.so.2.6.2 libtinyxml.so + + #**************************************************************************** + # common rules diff --git a/package/tinyxml/patches/patch-Makefile.orig b/package/tinyxml/patches/patch-Makefile.orig new file mode 100644 index 000000000..78372e7e5 --- /dev/null +++ b/package/tinyxml/patches/patch-Makefile.orig @@ -0,0 +1,60 @@ +--- tinyxml.orig/Makefile 2013-07-30 15:47:27.000000000 +0200 ++++ tinyxml/Makefile 2013-07-30 15:47:25.000000000 +0200 +@@ -15,13 +15,13 @@ PROFILE := NO + + # TINYXML_USE_STL can be used to turn on STL support. NO, then STL + # will not be used. YES will include the STL files. +-TINYXML_USE_STL := NO ++TINYXML_USE_STL := YES + + #**************************************************************************** + +-CC := gcc +-CXX := g++ +-LD := g++ ++CC ?= gcc ++CXX ?= g++ ++LD := $(CXX) + AR := ar rc + RANLIB := ranlib + +@@ -41,9 +41,9 @@ ifeq (YES, ${DEBUG}) + CXXFLAGS := ${DEBUG_CXXFLAGS} + LDFLAGS := ${DEBUG_LDFLAGS} + else +- CFLAGS := ${RELEASE_CFLAGS} +- CXXFLAGS := ${RELEASE_CXXFLAGS} +- LDFLAGS := ${RELEASE_LDFLAGS} ++ CFLAGS ?= ${RELEASE_CFLAGS} ++ CXXFLAGS ?= ${RELEASE_CXXFLAGS} ++ LDFLAGS ?= ${RELEASE_LDFLAGS} + endif + + ifeq (YES, ${PROFILE}) +@@ -81,7 +81,7 @@ CXXFLAGS := ${CXXFLAGS} ${DEFS} + # Targets of the build + #**************************************************************************** + +-OUTPUT := xmltest ++OUTPUT := libtinyxml.so.2.6.2 + + all: ${OUTPUT} + +@@ -90,7 +90,7 @@ all: ${OUTPUT} + # Source files + #**************************************************************************** + +-SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp ++SRCS := tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp + + # Add on the sources for libraries + SRCS := ${SRCS} +@@ -103,6 +103,8 @@ OBJS := $(addsuffix .o,$(basename ${SRCS + + ${OUTPUT}: ${OBJS} + ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} ++ ${CXX} -shared -Wl,-soname,libtinyxml.so.2.6.2 -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${EXTRA_LIBS} ++ ln -sf libtinyxml.so.2.6.2 libtinyxml.so + + #**************************************************************************** + # common rules diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile new file mode 100644 index 000000000..cdffe1852 --- /dev/null +++ b/package/xbmc/Makefile @@ -0,0 +1,65 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xbmc +PKG_VERSION:= 12.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba +PKG_DESCR:= software media player +PKG_SECTION:= multimedia +PKG_DEPENDS:= boost-shared libffmpeg python2 libstdcxx +PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad +PKG_DEPENDS+= libjpeg 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_BUILDDEP:= boost ffmpeg python2 MesaLib libglew libass +PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug +PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl +PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype +PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd +PKG_URL:= http://xbmc.org/ +PKG_SITES:= http://mirrors.xbmc.org/releases/source/ + +PKG_SYSTEM_DEPENDS:= raspberry-pi + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +XAKE_FLAGS+= V=1 TIXML_USE_STL=1 +XAKE_FLAGS+= GCC_HONOUR_COPTS=s +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \ + -DTIXML_USE_STL=1 \ + -I$(STAGING_DIR)/opt/vc/include \ + -I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \ + -I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux +TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static +#TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static -lX11 +CONFIGURE_ARGS+= --disable-optical-drive \ + --disable-ssh \ + --disable-samba \ + --disable-mysql \ + --enable-external-libraries \ + --enable-player=omxplayer \ + --enable-gles \ + --disable-sdl \ + --disable-joystick \ + --disable-x11 \ + --with-platform=raspberry-pi + +xbmc-install: + $(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc + $(CP) $(WRKINST)/usr/lib/xbmc/* \ + $(IDIR_XBMC)/usr/lib/xbmc + $(INSTALL_DIR) $(IDIR_XBMC)/usr/share/xbmc + $(CP) $(WRKINST)/usr/share/xbmc/* \ + $(IDIR_XBMC)/usr/share/xbmc + $(INSTALL_DIR) $(IDIR_XBMC)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \ + $(IDIR_XBMC)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xbmc/patches/patch-Makefile_include_in b/package/xbmc/patches/patch-Makefile_include_in new file mode 100644 index 000000000..2706f6698 --- /dev/null +++ b/package/xbmc/patches/patch-Makefile_include_in @@ -0,0 +1,10 @@ +--- xbmc-12.2.orig/Makefile.include.in 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/Makefile.include.in 2013-07-31 11:46:19.000000000 +0200 +@@ -32,6 +32,7 @@ CC=@CC@ + CXXFLAGS+=@CXXFLAGS@ + CFLAGS+=@CFLAGS@ + LDFLAGS+=@LDFLAGS@ ++INCLUDES+=@CPPFLAGS@ + INCLUDES+=-I@abs_top_srcdir@/lib + INCLUDES+=-I@abs_top_srcdir@/xbmc + INCLUDES+=$(sort @INCLUDES@) diff --git a/package/xbmc/patches/patch-configure b/package/xbmc/patches/patch-configure new file mode 100644 index 000000000..23c0e4bdb --- /dev/null +++ b/package/xbmc/patches/patch-configure @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/configure 2013-05-03 07:57:46.000000000 +0200 ++++ xbmc-12.2/configure 2013-07-31 14:45:10.000000000 +0200 +@@ -18629,7 +18629,7 @@ $as_echo "#define HAVE_LIBGLESV2 1" >>co + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: == WARNING: OpenGLES support is assumed." >&5 + $as_echo "== WARNING: OpenGLES support is assumed." >&6; } +- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm" ++ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lEGL" >&5 + $as_echo_n "checking for main in -lEGL... " >&6; } diff --git a/package/xbmc/patches/patch-lib_DllAvCodec_h b/package/xbmc/patches/patch-lib_DllAvCodec_h new file mode 100644 index 000000000..89b259d9c --- /dev/null +++ b/package/xbmc/patches/patch-lib_DllAvCodec_h @@ -0,0 +1,35 @@ +--- xbmc-12.2.orig/lib/DllAvCodec.h 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/lib/DllAvCodec.h 2013-07-31 12:23:26.000000000 +0200 +@@ -72,8 +72,8 @@ public: + virtual void avcodec_register_all(void)=0; + virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0; + virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)=0; +- virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0; +- virtual AVCodec *avcodec_find_encoder(enum CodecID id)=0; ++ virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0; ++ virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0; + virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0; + virtual AVFrame *avcodec_alloc_frame(void)=0; + virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0; +@@ -129,8 +129,8 @@ public: + } + virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; } + virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; } +- virtual AVCodec *avcodec_find_decoder(enum CodecID id) { return ::avcodec_find_decoder(id); } +- virtual AVCodec *avcodec_find_encoder(enum CodecID id) { return ::avcodec_find_encoder(id); } ++ virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); } ++ virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); } + virtual int avcodec_close(AVCodecContext *avctx) + { + CSingleLock lock(DllAvCodec::m_critSection); +@@ -203,8 +203,8 @@ class DllAvCodec : public DllDynamic, Dl + LOAD_SYMBOLS(); + + DEFINE_METHOD0(void, avcodec_register_all_dont_call) +- DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1)) +- DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum CodecID p1)) ++ DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1)) ++ DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1)) + DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1)) + DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame) + DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5)) diff --git a/package/xbmc/patches/patch-lib_DllAvFilter_h b/package/xbmc/patches/patch-lib_DllAvFilter_h new file mode 100644 index 000000000..9f1188165 --- /dev/null +++ b/package/xbmc/patches/patch-lib_DllAvFilter_h @@ -0,0 +1,46 @@ +--- xbmc-12.2.orig/lib/DllAvFilter.h 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/lib/DllAvFilter.h 2013-08-01 10:49:46.000000000 +0200 +@@ -45,6 +45,7 @@ extern "C" { + #if (defined HAVE_LIBAVFILTER_AVFILTER_H) + #include + #include ++ #include + #include + #elif (defined HAVE_FFMPEG_AVFILTER_H) + #include +@@ -77,7 +78,7 @@ public: + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0; + #else +- virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0; ++ virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0; + #endif + virtual void avfilter_unref_buffer(AVFilterBufferRef *ref)=0; + virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad)=0; +@@ -137,7 +138,7 @@ public: + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); } + #else +- virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); } ++ virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame_flags(buffer_filter, frame, flags); } + #endif + virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); } + virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); } +@@ -175,7 +176,7 @@ class DllAvFilter : public DllDynamic, D + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + DEFINE_METHOD3(int, av_vsrc_buffer_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3)) + #else +- DEFINE_METHOD3(int, av_buffersrc_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3)) ++ DEFINE_METHOD3(int, av_buffersrc_add_frame_flag, (AVFilterContext *p1, AVFrame *p2, int p3)) + #endif + DEFINE_METHOD1(void, avfilter_unref_buffer, (AVFilterBufferRef *p1)) + DEFINE_METHOD4(int, avfilter_link, (AVFilterContext *p1, unsigned p2, AVFilterContext *p3, unsigned p4)) +@@ -198,7 +199,7 @@ class DllAvFilter : public DllDynamic, D + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + RESOLVE_METHOD(av_vsrc_buffer_add_frame) + #else +- RESOLVE_METHOD(av_buffersrc_add_frame) ++ RESOLVE_METHOD(av_buffersrc_add_frame_flag) + #endif + RESOLVE_METHOD(avfilter_unref_buffer) + RESOLVE_METHOD(avfilter_link) diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in new file mode 100644 index 000000000..a08eb0a94 --- /dev/null +++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in @@ -0,0 +1,15 @@ +--- xbmc-12.2.orig/tools/Linux/xbmc.sh.in 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/tools/Linux/xbmc.sh.in 2013-08-05 16:24:14.000000000 +0200 +@@ -107,12 +107,6 @@ print_crash_report() + echo "Crash report available at $FILE" + } + +-python @datadir@/xbmc/FEH.py $SAVED_ARGS +-RET=$? +-if [ $RET -ne 0 ]; then +- exit $RET +-fi +- + if which gdb >/dev/null 2>&1; then + # Output warning in case ulimit is unsupported by shell + eval ulimit -c unlimited diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp new file mode 100644 index 000000000..81b0b931d --- /dev/null +++ b/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp @@ -0,0 +1,17 @@ +--- xbmc-12.2.orig/tools/TexturePacker/XBMCTex.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/tools/TexturePacker/XBMCTex.cpp 2013-08-01 16:12:13.000000000 +0200 +@@ -35,12 +35,12 @@ + #include + #undef main + +-#include "guilib/XBTF.h" ++#include "../../xbmc/guilib/XBTF.h" + #include "XBTFWriter.h" + #include "md5.h" + #include "SDL_anigif.h" + #include "cmdlineargs.h" +-#include "libsquish/squish.h" ++#include "../../lib/libsquish/squish.h" + + #ifdef _WIN32 + #define strncasecmp strnicmp diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp new file mode 100644 index 000000000..91be356a7 --- /dev/null +++ b/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp @@ -0,0 +1,13 @@ +--- xbmc-12.2.orig/tools/TexturePacker/XBTFWriter.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/tools/TexturePacker/XBTFWriter.cpp 2013-08-01 13:50:44.000000000 +0200 +@@ -22,8 +22,8 @@ + #include "XBTFWriter.h" + #define __STDC_FORMAT_MACROS + #include +-#include "guilib/XBTF.h" +-#include "utils/EndianSwap.h" ++#include "../../xbmc/guilib/XBTF.h" ++#include "../../xbmc/utils/EndianSwap.h" + #if defined(__FreeBSD__) + #include + #elif !defined(__APPLE__) diff --git a/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h b/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h new file mode 100644 index 000000000..efded26b5 --- /dev/null +++ b/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/tools/TexturePacker/cmdlineargs.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/tools/TexturePacker/cmdlineargs.h 2013-08-01 14:37:40.000000000 +0200 +@@ -23,7 +23,7 @@ + */ + + #ifdef _LINUX +-#include "PlatformDefs.h" ++#include "../../xbmc/linux/PlatformDefs.h" + #include "xwinapi.h" + typedef LPSTR PSZ; + #define _snprintf snprintf diff --git a/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h b/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h new file mode 100644 index 000000000..1cc7efdc1 --- /dev/null +++ b/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/tools/TexturePacker/xwinapi.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/tools/TexturePacker/xwinapi.h 2013-08-01 15:51:48.000000000 +0200 +@@ -22,7 +22,7 @@ + * + */ + +-#include "PlatformDefs.h" ++#include "../../xbmc/linux/PlatformDefs.h" + + LPTSTR GetCommandLine(); + DWORD GetCurrentDirectory(DWORD nBufferLength, LPTSTR lpBuffer); diff --git a/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h b/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h new file mode 100644 index 000000000..080fc7d2c --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cdrip/EncoderFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cdrip/EncoderFFmpeg.h 2013-07-31 12:34:15.000000000 +0200 +@@ -26,6 +26,8 @@ + #include "DllAvCodec.h" + #include "DllAvUtil.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + class CEncoderFFmpeg : public CEncoder + { + public: diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp new file mode 100644 index 000000000..aeabd9a4f --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp 2013-07-31 12:56:28.000000000 +0200 +@@ -226,7 +226,7 @@ unsigned int CAEEncoderFFmpeg::GetBitRat + return m_BitRate; + } + +-CodecID CAEEncoderFFmpeg::GetCodecID() ++AVCodecID CAEEncoderFFmpeg::GetCodecID() + { + return m_CodecID; + } diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h new file mode 100644 index 000000000..6926ff5dc --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h 2013-07-31 12:47:10.000000000 +0200 +@@ -39,7 +39,7 @@ public: + virtual void Reset(); + + virtual unsigned int GetBitRate (); +- virtual CodecID GetCodecID (); ++ virtual AVCodecID GetCodecID (); + virtual unsigned int GetFrames (); + + virtual int Encode (float *data, unsigned int frames); +@@ -51,7 +51,7 @@ private: + DllAvUtil m_dllAvUtil; + + std::string m_CodecName; +- CodecID m_CodecID; ++ AVCodecID m_CodecID; + unsigned int m_BitRate; + CAEPackIEC61937::PackFunc m_PackFunc; + diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h new file mode 100644 index 000000000..1559ae28b --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h @@ -0,0 +1,15 @@ +--- xbmc-12.2.orig/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h 2013-07-31 12:50:47.000000000 +0200 +@@ -64,10 +64,10 @@ public: + virtual unsigned int GetBitRate() = 0; + + /** +- * Returns the CodecID of the encoder ++ * Returns the AVCodecID of the encoder + * @return the ffmpeg codec id + */ +- virtual CodecID GetCodecID() = 0; ++ virtual AVCodecID GetCodecID() = 0; + + /** + * Return the number of frames needed to encode diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp new file mode 100644 index 000000000..a4702f82c --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDAudio.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDAudio.cpp 2013-07-31 13:31:59.000000000 +0200 +@@ -116,7 +116,7 @@ CDVDAudio::~CDVDAudio() + free(m_pBuffer); + } + +-bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler) ++bool CDVDAudio::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler) + { + CLog::Log(LOGNOTICE, + "Creating audio stream (codec id: %i, channels: %i, sample rate: %i, %s)", diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h new file mode 100644 index 000000000..6e1e9e018 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDAudio.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDAudio.h 2013-07-31 13:29:46.000000000 +0200 +@@ -31,7 +31,7 @@ + class IAEStream; + + #ifndef _LINUX +-enum CodecID; ++enum AVCodecID; + #else + extern "C" { + #if (defined USE_EXTERNAL_FFMPEG) +@@ -80,7 +80,7 @@ public: + float GetCurrentAttenuation(); + void Pause(); + void Resume(); +- bool Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler); ++ bool Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler); + bool IsValidFormat(const DVDAudioFrame &audioframe); + void Destroy(); + DWORD AddPackets(const DVDAudioFrame &audioframe); diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp new file mode 100644 index 000000000..7d0f6f63c --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2013-08-01 16:38:47.000000000 +0200 +@@ -26,6 +26,8 @@ + #include "utils/log.h" + #include "settings/GUISettings.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + CDVDAudioCodecFFmpeg::CDVDAudioCodecFFmpeg() : CDVDAudioCodec() + { + m_iBufferSize1 = 0; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h new file mode 100644 index 000000000..f33663dd0 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h @@ -0,0 +1,17 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h 2013-08-01 16:40:52.000000000 +0200 +@@ -24,6 +24,7 @@ + #include "DVDCodecs/DVDCodecs.h" + #include "DVDAudioCodecPcm.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + #define LPCM_BUFFER_SIZE (AVCODEC_MAX_AUDIO_FRAME_SIZE / 2) + + class CDVDAudioCodecLPcm : public CDVDAudioCodecPcm +@@ -40,5 +41,5 @@ protected: + int m_bufferSize; + BYTE m_buffer[LPCM_BUFFER_SIZE]; + +- CodecID m_codecID; ++ AVCodecID m_codecID; + }; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h new file mode 100644 index 000000000..1399c9b6f --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h 2013-08-01 16:41:17.000000000 +0200 +@@ -28,6 +28,8 @@ + + #include "DVDAudioCodec.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + class CDVDAudioCodecPassthroughFFmpeg : public CDVDAudioCodec + { + public: +@@ -94,7 +96,7 @@ private: + unsigned int m_Needed; + bool m_LostSync; + int m_SampleRate; +- CodecID m_codec; ++ AVCodecID m_codec; + + unsigned int (CDVDAudioCodecPassthroughFFmpeg::*m_pSyncFrame)(BYTE* pData, unsigned int iSize, unsigned int *fSize); + unsigned int SyncAC3(BYTE* pData, unsigned int iSize, unsigned int *fSize); diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp new file mode 100644 index 000000000..b89e92b69 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp 2013-08-01 16:40:23.000000000 +0200 +@@ -22,6 +22,8 @@ + #include "DVDStreamInfo.h" + #include "DVDCodecs/DVDCodecs.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + /* from g711.c by SUN microsystems (unrestricted use) */ + #define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ + #define QUANT_MASK (0xf) /* Quantization field mask. */ diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h new file mode 100644 index 000000000..ea08c992b --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h 2013-07-31 13:30:38.000000000 +0200 +@@ -44,7 +44,7 @@ protected: + short m_decodedData[131072]; // could be a bit to big + int m_decodedDataSize; + +- CodecID m_codecID; ++ AVCodecID m_codecID; + int m_iSourceSampleRate; + int m_iSourceChannels; + int m_iSourceBitrate; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h new file mode 100644 index 000000000..6fc61ac63 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h 2013-07-31 13:30:54.000000000 +0200 +@@ -23,7 +23,7 @@ + #if (defined HAVE_CONFIG_H) && (!defined WIN32) + #include "config.h" + #endif +-// enum CodecID ++// enum AVCodecID + + #include + #include diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp new file mode 100644 index 000000000..6f890a386 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-08-01 17:02:17.000000000 +0200 +@@ -60,7 +60,7 @@ bool CDVDOverlayCodecFFmpeg::Open(CDVDSt + m_pCodecContext->debug_mv = 0; + m_pCodecContext->debug = 0; + m_pCodecContext->workaround_bugs = FF_BUG_AUTODETECT; +- m_pCodecContext->sub_id = hints.identifier; ++ //m_pCodecContext->sub_id = hints.identifier; + m_pCodecContext->codec_tag = hints.codec_tag; + m_pCodecContext->time_base.num = 1; + m_pCodecContext->time_base.den = DVD_TIME_BASE; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp new file mode 100644 index 000000000..70565968f --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp @@ -0,0 +1,28 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2013-08-01 17:31:00.000000000 +0200 +@@ -273,7 +273,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre + } + + // set acceleration +- m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE; ++ //m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE; + + // advanced setting override for skip loop filter (see avcodec.h for valid options) + // TODO: allow per video setting? +@@ -799,14 +799,14 @@ int CDVDVideoCodecFFmpeg::FilterProcess( + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0); + #else +- result = m_dllAvFilter.av_buffersrc_add_frame(m_pFilterIn, frame, 0); ++ result = m_dllAvFilter.av_buffersrc_add_frame_flags(m_pFilterIn, frame, 0); + #endif + if (result < 0) + { + #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) + CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_vsrc_buffer_add_frame"); + #else +- CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_buffersrc_add_frame"); ++ CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_buffersrc_add_frame_flags"); + #endif + return VC_ERROR; + } diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp new file mode 100644 index 000000000..c74b05e6a --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2013-08-01 17:35:11.000000000 +0200 +@@ -1043,7 +1043,7 @@ void CDVDDemuxFFmpeg::AddStream(int iId) + { + CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream); + m_streams[iId] = st; +- st->identifier = pStream->codec->sub_id; ++ //st->identifier = pStream->codec->sub_id; + + if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)) + st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp new file mode 100644 index 000000000..735872732 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp @@ -0,0 +1,47 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp 2013-08-01 16:48:30.000000000 +0200 +@@ -349,7 +349,7 @@ void CDVDDemuxPVRClient::RequestStreams( + { + st = dynamic_cast(stm); + if (!st +- || (st->codec != (CodecID)props.stream[i].iCodecId) ++ || (st->codec != (AVCodecID)props.stream[i].iCodecId) + || (st->iChannels != props.stream[i].iChannels)) + DisposeStream(i); + } +@@ -375,7 +375,7 @@ void CDVDDemuxPVRClient::RequestStreams( + { + st = dynamic_cast(stm); + if (!st +- || (st->codec != (CodecID)props.stream[i].iCodecId) ++ || (st->codec != (AVCodecID)props.stream[i].iCodecId) + || (st->iWidth != props.stream[i].iWidth) + || (st->iHeight != props.stream[i].iHeight)) + DisposeStream(i); +@@ -399,7 +399,7 @@ void CDVDDemuxPVRClient::RequestStreams( + { + if (stm) + { +- if (stm->codec != (CodecID)props.stream[i].iCodecId) ++ if (stm->codec != (AVCodecID)props.stream[i].iCodecId) + DisposeStream(i); + } + if (!m_streams[i]) +@@ -411,7 +411,7 @@ void CDVDDemuxPVRClient::RequestStreams( + if (stm) + { + st = dynamic_cast(stm); +- if (!st || (st->codec != (CodecID)props.stream[i].iCodecId)) ++ if (!st || (st->codec != (AVCodecID)props.stream[i].iCodecId)) + DisposeStream(i); + } + if (!m_streams[i]) +@@ -428,7 +428,7 @@ void CDVDDemuxPVRClient::RequestStreams( + m_streams[i] = new CDemuxStream(); + } + +- m_streams[i]->codec = (CodecID)props.stream[i].iCodecId; ++ m_streams[i]->codec = (AVCodecID)props.stream[i].iCodecId; + m_streams[i]->iId = i; + m_streams[i]->iPhysicalId = props.stream[i].iPhysicalId; + m_streams[i]->language[0] = props.stream[i].strLanguage[0]; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h new file mode 100644 index 000000000..cb849c5db --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h @@ -0,0 +1,29 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-07-31 13:31:34.000000000 +0200 +@@ -35,7 +35,7 @@ class CDVDInputStream; + #include "config.h" + #endif + #ifndef _LINUX +-enum CodecID; ++enum AVCodecID; + #include + #else + extern "C" { +@@ -88,7 +88,7 @@ public: + { + iId = 0; + iPhysicalId = 0; +- codec = (CodecID)0; // CODEC_ID_NONE ++ codec = (AVCodecID)0; // CODEC_ID_NONE + codec_fourcc = 0; + profile = FF_PROFILE_UNKNOWN; + level = 0; +@@ -118,7 +118,7 @@ public: + + int iId; // most of the time starting from 0 + int iPhysicalId; // id +- CodecID codec; ++ AVCodecID codec; + unsigned int codec_fourcc; // if available + int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. + int level; // encoder level of the stream reported by the decoder. used to qualify hw decoders. diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h new file mode 100644 index 000000000..c426d5c72 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDPlayerAudio.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDPlayerAudio.h 2013-07-31 13:31:10.000000000 +0200 +@@ -38,7 +38,7 @@ class CDVDAudioCodec; + class IAudioCallback; + class CDVDAudioCodec; + +-enum CodecID; ++enum AVCodecID; + + #define DECODE_FLAG_DROP 1 + #define DECODE_FLAG_RESYNC 2 diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h new file mode 100644 index 000000000..685535f93 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDPlayerVideo.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDPlayerVideo.h 2013-07-31 13:27:19.000000000 +0200 +@@ -31,7 +31,7 @@ + #include "cores/VideoRenderers/RenderManager.h" + #endif + +-enum CodecID; ++enum AVCodecID; + class CDemuxStreamVideo; + class CDVDOverlayCodecCC; + diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h new file mode 100644 index 000000000..f1e08e7fc --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDStreamInfo.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDStreamInfo.h 2013-07-31 13:29:19.000000000 +0200 +@@ -25,7 +25,7 @@ + #endif + #ifndef _LINUX + enum StreamType; +-enum CodecID; ++enum AVCodecID; + #else + #include "DVDDemuxers/DVDDemux.h" + extern "C" { +@@ -59,7 +59,7 @@ public: + void Assign(const CDVDStreamInfo &right, bool withextradata); + void Assign(const CDemuxStream &right, bool withextradata); + +- CodecID codec; ++ AVCodecID codec; + StreamType type; + bool software; //force software decoding + diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp new file mode 100644 index 000000000..e5238a67c --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp @@ -0,0 +1,10 @@ +--- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp 2013-08-01 11:16:43.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include "cores/AudioEngine/Utils/AEUtil.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + #define MAX_AUDIO_FRAME_SIZE (AVCODEC_MAX_AUDIO_FRAME_SIZE*2) + + template diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp new file mode 100644 index 000000000..5fa0096d1 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudio.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudio.cpp 2013-07-31 13:42:40.000000000 +0200 +@@ -1225,7 +1225,7 @@ void COMXAudio::SetCodingType(AEDataForm + } + } + +-bool COMXAudio::CanHWDecode(CodecID codec) ++bool COMXAudio::CanHWDecode(AVCodecID codec) + { + bool ret = false; + switch(codec) diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h new file mode 100644 index 000000000..9f59c81cf --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudio.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudio.h 2013-07-31 13:21:40.000000000 +0200 +@@ -85,7 +85,7 @@ public: + void Process(); + + void SetCodingType(AEDataFormat dataFormat); +- static bool CanHWDecode(CodecID codec); ++ static bool CanHWDecode(AVCodecID codec); + + void PrintChannels(OMX_AUDIO_CHANNELTYPE eChannelMapping[]); + void PrintPCM(OMX_AUDIO_PARAM_PCMMODETYPE *pcm, std::string direction); diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp new file mode 100644 index 000000000..8aa00f6b6 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXVideo.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/omxplayer/OMXVideo.cpp 2013-07-31 13:32:13.000000000 +0200 +@@ -131,7 +131,7 @@ bool COMXVideo::SendDecoderConfig() + return true; + } + +-bool COMXVideo::NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize) ++bool COMXVideo::NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize) + { + switch(codec) + { diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h new file mode 100644 index 000000000..270a4fe5a --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXVideo.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/omxplayer/OMXVideo.h 2013-07-31 13:17:20.000000000 +0200 +@@ -98,7 +98,7 @@ protected: + ResolutionUpdateCallBackFn m_res_callback; + void *m_res_ctx; + bool m_submitted_eos; +- bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize); ++ bool NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize); + }; + + #endif diff --git a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp new file mode 100644 index 000000000..64d7e0179 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/utils/BitstreamConverter.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/utils/BitstreamConverter.cpp 2013-07-31 13:28:28.000000000 +0200 +@@ -431,7 +431,7 @@ CBitstreamConverter::~CBitstreamConverte + Close(); + } + +-bool CBitstreamConverter::Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) ++bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) + { + m_to_annexb = to_annexb; + diff --git a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h new file mode 100644 index 000000000..1712372fb --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/utils/BitstreamConverter.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/utils/BitstreamConverter.h 2013-07-31 13:28:52.000000000 +0200 +@@ -114,7 +114,7 @@ public: + static void skip_bits( bits_reader_t *br, int nbits ); + static uint32_t get_bits( bits_reader_t *br, int nbits ); + +- bool Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); ++ bool Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); + void Close(void); + bool NeedConvert(void) { return m_convert_bitstream; }; + bool Convert(uint8_t *pData, int iSize); +@@ -163,7 +163,7 @@ protected: + bool m_convert_bytestream; + DllAvUtil *m_dllAvUtil; + DllAvFormat *m_dllAvFormat; +- CodecID m_codec; ++ AVCodecID m_codec; + }; + + #endif diff --git a/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h b/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h new file mode 100644 index 000000000..196771daa --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/xbmc/utils/EndianSwap.h 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/utils/EndianSwap.h 2013-08-01 14:17:04.000000000 +0200 +@@ -26,7 +26,7 @@ + /* Include config.h to define (or not) WORDS_BIGENDIAN + File created by configure */ + #if defined(__linux__) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) +-#include "config.h" ++#include "../config.h" + #include + #endif + #ifdef _WIN32 diff --git a/package/xdpyinfo/Makefile b/package/xdpyinfo/Makefile new file mode 100644 index 000000000..faa321bb5 --- /dev/null +++ b/package/xdpyinfo/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xdpyinfo +PKG_VERSION:= 1.3.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 588a84f9762c7e4e2b72508f16005b48 +PKG_DESCR:= xdpyinfo +PKG_SECTION:= x11/apps +PKG_DEPENDS:= libxtst +PKG_BUILDDEP:= libXtst +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XDPYINFO,xdpyinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +xdpyinfo-install: + $(INSTALL_DIR) $(IDIR_XDPYINFO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/xdpyinfo \ + $(IDIR_XDPYINFO)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/yajl/Makefile b/package/yajl/Makefile new file mode 100644 index 000000000..4de665545 --- /dev/null +++ b/package/yajl/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= yajl +PKG_VERSION:= 2.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c953a53344c0e20a892fc042bbe69744 +PKG_DESCR:= a small event-driven JSON parser written in ANSI C +PKG_SECTION:= libs +PKG_URL:= http://lloyd.github.com/yajl/ +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual + +do-configure: + (cd ${WRKBUILD} && ./configure --prefix /usr) + +yajl-install: + $(INSTALL_DIR) $(IDIR_YAJL)/usr/lib + $(CP) $(WRKINST)/usr/lib/libyajl*.so* \ + $(IDIR_YAJL)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/yajl/patches/patch-CMakeLists_txt b/package/yajl/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..c1405d6c9 --- /dev/null +++ b/package/yajl/patches/patch-CMakeLists_txt @@ -0,0 +1,19 @@ +--- yajl-2.0.1.orig/CMakeLists.txt 2011-04-28 04:48:41.000000000 +0200 ++++ yajl-2.0.1/CMakeLists.txt 2013-07-30 15:20:53.000000000 +0200 +@@ -64,16 +64,5 @@ ENDIF (WIN32) + + + ADD_SUBDIRECTORY(src) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(reformatter) +-ADD_SUBDIRECTORY(verify) +-ADD_SUBDIRECTORY(example) +-ADD_SUBDIRECTORY(perf) + +-INCLUDE(YAJLDoc.cmake) +- +-# a test target +-ADD_CUSTOM_TARGET(test +- ./run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/test/yajl_test +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test) + diff --git a/package/yajl/patches/patch-CMakeLists_txt.orig b/package/yajl/patches/patch-CMakeLists_txt.orig new file mode 100644 index 000000000..6d1a3f75a --- /dev/null +++ b/package/yajl/patches/patch-CMakeLists_txt.orig @@ -0,0 +1,14 @@ +--- yajl-2.0.1.orig/CMakeLists.txt 2011-04-28 04:48:41.000000000 +0200 ++++ yajl-2.0.1/CMakeLists.txt 2013-07-30 15:13:12.000000000 +0200 +@@ -64,11 +64,6 @@ ENDIF (WIN32) + + + ADD_SUBDIRECTORY(src) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(reformatter) +-ADD_SUBDIRECTORY(verify) +-ADD_SUBDIRECTORY(example) +-ADD_SUBDIRECTORY(perf) + + INCLUDE(YAJLDoc.cmake) + diff --git a/package/yajl/patches/patch-configure b/package/yajl/patches/patch-configure new file mode 100644 index 000000000..8ab73fc1c --- /dev/null +++ b/package/yajl/patches/patch-configure @@ -0,0 +1,11 @@ +--- yajl-2.0.1.orig/configure 2011-04-28 04:48:41.000000000 +0200 ++++ yajl-2.0.1/configure 2013-07-30 15:34:21.000000000 +0200 +@@ -49,7 +49,7 @@ end + puts "== Generating Makefile" + File.open("Makefile", "w+") do |f| + f.puts ".PHONY: all clean distclean install package test distro" +- f.puts "all: distro doc test" ++ f.puts "all: distro" + f.puts + f.puts "distro:" + f.puts " @cd build && make" -- cgit v1.2.3