6 files changed, 46 insertions, 101 deletions

diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index 64cc34572578..69e31f430cfe 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	xbmc
-PORTVERSION=	58
-PORTREVISION=	3
+PORTVERSION=	65
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/nox
 PKGNAMESUFFIX=	-pvr-ppa-odk
-DISTNAME=	opdenkamp-${PORTNAME}-Eden-pvr_beta1-0-g${GITHASH}
+DISTNAME=	opdenkamp-${PORTNAME}-Eden-pvr_beta2-0-g${GITHASH}
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	XBMC is an award winning media center application - PVR branch
@@ -63,7 +62,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
-GITHASH=	84817e6
+GITHASH=	cbe2cf3
 WRKSRC=		${WRKDIR}/opdenkamp-${PORTNAME}-${GITHASH}
 FETCH_ARGS=	-Fpr
 USE_GMAKE=	yes
@@ -221,8 +220,6 @@ post-patch:
 		${WRKSRC}/lib/timidity/configure.in \
 		${WRKSRC}/xbmc/screensavers/rsxs-0.9/acinclude.m4
 	${RM} ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon.h.orig
-	${RM} ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui.h.orig
-	${RM} ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr.h.orig
 # XXX somehow there are still references to linux libraries, if you find
 # where they come from please tell us!
 .if ${ARCH} == "amd64"
diff --git a/multimedia/xbmc-pvr/distinfo b/multimedia/xbmc-pvr/distinfo
index 73c82c3b85c1..c713f1f42a06 100644
--- a/multimedia/xbmc-pvr/distinfo
+++ b/multimedia/xbmc-pvr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opdenkamp-xbmc-Eden-pvr_beta1-0-g84817e6.tar.gz) = ce297739aaa54e689360cdcf65b78d5b3a19514fd4cca044de0f1909b5561e26
-SIZE (opdenkamp-xbmc-Eden-pvr_beta1-0-g84817e6.tar.gz) = 57943304
+SHA256 (opdenkamp-xbmc-Eden-pvr_beta2-0-gcbe2cf3.tar.gz) = a165b491092b25be7f8d989cc7c4974a8b01f72ed2a10d529f58710673583261
+SIZE (opdenkamp-xbmc-Eden-pvr_beta2-0-gcbe2cf3.tar.gz) = 57981055
diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
index 802692fd6a1f..25cd80edbc2e 100644
--- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
+++ b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h
@@ -1,34 +1,33 @@
 --- addons/library.xbmc.addon/libXBMC_addon.h.orig
 +++ addons/library.xbmc.addon/libXBMC_addon.h
-@@ -40,15 +40,31 @@
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-osx.so"
+@@ -41,6 +41,22 @@
+ #else
+ #define ADDON_HELPER_ARCH       "x86"
  #endif
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-freebsd.so"
 +#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-freebsd.so"
++#if defined(__FreeBSD__)         // FreeBSD
++#define ADDON_HELPER_PLATFORM   "freebsd"
++#if defined(__x86_64__)
++#define ADDON_HELPER_ARCH       "x86_64"
++#elif defined(_POWERPC)
++#define ADDON_HELPER_ARCH       "powerpc"
++#elif defined(_POWERPC64)
++#define ADDON_HELPER_ARCH       "powerpc64"
++#elif defined(_ARMEL)
++#define ADDON_HELPER_ARCH       "arm"
++#elif defined(_MIPSEL)
++#define ADDON_HELPER_ARCH       "mipsel"
 +#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-linux.so"
++#define ADDON_HELPER_ARCH       "x86"
 +#endif
- #elif defined(_ARMEL)
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-arm.so"
- #else /* !__x86_64__ && !__powerpc__ */
-+#ifdef __FreeBSD__
-+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-freebsd.so"
-+#else
- #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i486-linux.so"
+ #else                           // linux
+ #define ADDON_HELPER_PLATFORM   "linux"
+ #if defined(__x86_64__)
+@@ -57,6 +73,7 @@
+ #define ADDON_HELPER_ARCH       "i486"
+ #endif
+ #endif
 +#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
+ #include <dlfcn.h>              // linux+osx
+ #define ADDON_HELPER_EXT        ".so"
+ #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h
deleted file mode 100644
index cdce867cbbdc..000000000000
--- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- addons/library.xbmc.gui/libXBMC_gui.h.orig
-+++ addons/library.xbmc.gui/libXBMC_gui.h
-@@ -44,13 +44,29 @@ typedef void* GUIHANDLE;
- #elif defined(_ARMEL)
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-arm.so"
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-linux.so"
-+#endif
- #else /* !__x86_64__ && !__powerpc__ && !_ARMEL */
-+#ifdef __FreeBSD__
-+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86-freebsd.so"
-+#else
- #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i486-linux.so"
-+#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h
deleted file mode 100644
index 64509e23ee5c..000000000000
--- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- addons/library.xbmc.pvr/libXBMC_pvr.h.orig
-+++ addons/library.xbmc.pvr/libXBMC_pvr.h
-@@ -41,15 +41,31 @@
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so"
-+#endif
- #elif defined(_POWERPC)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-linux.so"
-+#endif
- #elif defined(_POWERPC64)
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-linux.so"
-+#endif
- #elif defined(_ARMEL)
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-arm.so"
- #else /* !__x86_64__ && !__powerpc__ */
-+#ifdef __FreeBSD__
-+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-freebsd.so"
-+#else
- #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i486-linux.so"
-+#endif
- #endif /* __x86_64__ */
- #endif /* _LINUX */
- 
diff --git a/multimedia/xbmc-pvr/pkg-plist b/multimedia/xbmc-pvr/pkg-plist
index f0df560387d1..7891f85c66e7 100644
--- a/multimedia/xbmc-pvr/pkg-plist
+++ b/multimedia/xbmc-pvr/pkg-plist
@@ -101,6 +101,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English/strings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French/strings.xml
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German/strings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml
@@ -134,10 +135,12 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/metadata.yahoomusic.com/icon.png
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English/strings.xml
+%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml
+%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/resources/settings.xml
 %%DATADIR%%/addons/metadata.yahoomusic.com/yahoomusic.xml
 %%DATADIR%%/addons/pvr.hts/addon.xml
@@ -369,6 +372,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/language/Italian/strings.xml
 %%DATADIR%%/addons/skin.confluence/language/Japanese/strings.xml
 %%DATADIR%%/addons/skin.confluence/language/Korean/strings.xml
+%%DATADIR%%/addons/skin.confluence/language/Lithuanian/strings.xml
 %%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.xml
 %%DATADIR%%/addons/skin.confluence/language/Polish/strings.xml
 %%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
@@ -838,7 +842,9 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/weather.wunderground/default.py
 %%DATADIR%%/addons/weather.wunderground/icon.png
 %%DATADIR%%/addons/weather.wunderground/resources/language/English/strings.xml
+%%DATADIR%%/addons/weather.wunderground/resources/language/Finnish/strings.xml
 %%DATADIR%%/addons/weather.wunderground/resources/language/German/strings.xml
+%%DATADIR%%/addons/weather.wunderground/resources/language/Swedish/strings.xml
 %%DATADIR%%/addons/weather.wunderground/resources/lib/utilities.py
 %%DATADIR%%/addons/weather.wunderground/resources/settings.xml
 %%DATADIR%%/addons/webinterface.default/addon.xml
@@ -925,6 +931,8 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/language/Japanese/strings.xml
 %%DATADIR%%/language/Korean/langinfo.xml
 %%DATADIR%%/language/Korean/strings.xml
+%%DATADIR%%/language/Lithuanian/langinfo.xml
+%%DATADIR%%/language/Lithuanian/strings.xml
 %%DATADIR%%/language/Maltese/langinfo.xml
 %%DATADIR%%/language/Maltese/strings.xml
 %%DATADIR%%/language/Norwegian/langinfo.xml
@@ -1133,6 +1141,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/language/Polish
 @dirrm %%DATADIR%%/language/Norwegian
 @dirrm %%DATADIR%%/language/Maltese
+@dirrm %%DATADIR%%/language/Lithuanian
 @dirrm %%DATADIR%%/language/Korean
 @dirrm %%DATADIR%%/language/Japanese
 @dirrm %%DATADIR%%/language/Italian
@@ -1171,7 +1180,9 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/webinterface.default/css
 @dirrm %%DATADIR%%/addons/webinterface.default
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Swedish
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/German
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Finnish
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources
@@ -1275,6 +1286,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Portuguese
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Polish
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Norwegian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Lithuanian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Korean
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Japanese
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Italian
@@ -1376,10 +1388,12 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/pvr.hts/resources/language
 @dirrm %%DATADIR%%/addons/pvr.hts/resources
 @dirrm %%DATADIR%%/addons/pvr.hts
+@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Swedish
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Finnish
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch
 @dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language
@@ -1411,6 +1425,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French
+@dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)