Remove the unbundling of projectM seems like 2.1 again does not work well even after fixed underlinking (now it just crashes the xbmc with pretty trace).

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

6 files changed, 13 insertions, 233 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index c1656d5dad6c..16358e3037ea 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.191 2013/07/06 11:25:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.192 2013/07/06 12:12:03 scarabeus Exp $
+
+  06 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/xbmc-12.0-system-projectm.patch,
+  -files/xbmc-13.0-system-projectm.patch, xbmc-12.1-r1.ebuild,
+  xbmc-12.2-r1.ebuild, xbmc-9999.ebuild:
+  Remove the unbundling of projectM seems like 2.1 again does not work well even
+  after fixed underlinking (now it just crashes the xbmc with pretty trace).
 
   06 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   files/xbmc-12.0-system-projectm.patch, files/xbmc-13.0-system-projectm.patch:
diff --git a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
deleted file mode 100644
index 0a42fcad9891..000000000000
--- a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 72f017641cf7acdb1d3caf408bbcdaec39de8ce3 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Sat, 23 Feb 2013 11:21:44 +0100
-Subject: [PATCH] Allow usage of system ProjectM
-
-Conflicts:
-	configure.in
----
- configure.in                                 | 45 ++++++++++++++++++++++++----
- xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
- 2 files changed, 45 insertions(+), 12 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 78104ad..296eb4d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -302,9 +302,15 @@ AC_ARG_ENABLE([rsxs],
- 
- AC_ARG_ENABLE([projectm],
-   [AS_HELP_STRING([--enable-projectm],
--  [enable ProjectM visualisation (default is yes)])],
-+  [enable ProjectM visualisation (default is auto)])],
-   [use_projectm=$enableval],
--  [use_projectm=yes])
-+  [use_projectm=auto])
-+
-+AC_ARG_WITH([projectm-presets-dir],
-+  [AS_HELP_STRING([--with-projectm-presets-dir],
-+  [path to ProjectM presets to incude in default list (default is bundled path)])],
-+  [projectm_presets_dir=$withval],
-+  [projectm_presets_dir=bundled])
- 
- AC_ARG_ENABLE([x11],
-   [AS_HELP_STRING([--enable-x11],
-@@ -1257,9 +1263,38 @@ fi
- if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
-   AC_MSG_NOTICE($projectm_disabled)
-   DISABLE_PROJECTM=1
-+  DISABLE_INTERNAL_PROJECTM=1
- else
--  AC_MSG_NOTICE($projectm_enabled)
--  DISABLE_PROJECTM=0
-+  if test "$host_vendor" != "apple" ; then
-+    if test "$use_projectm" = "yes"; then
-+      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
-+    else
-+      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
-+    fi
-+    if test "$use_projectm" != "no"; then
-+      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
-+    fi
-+    DISABLE_INTERNAL_PROJECTM=1
-+  else
-+    DISABLE_INTERNAL_PROJECTM=0
-+  fi
-+  if test "$use_projectm" != "no"; then
-+    AC_MSG_NOTICE($projectm_enabled)
-+    DISABLE_PROJECTM=0
-+    # verify preset dir actually exist if user don't want to use bundled one
-+    if test "$projectm_presets_dir" != "bundled" ; then
-+      if ! test -d "$projectm_presets_dir"; then
-+        AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
-+      fi
-+      PROJECTM_PRESETS_DIR=$projectm_presets_dir
-+    else
-+      PROJECTM_PRESETS_DIR=libprojectM/presets/
-+    fi
-+    AC_SUBST(PROJECTM_PRESETS_DIR)
-+  else
-+    AC_MSG_NOTICE($projectm_disabled)
-+    DISABLE_PROJECTM=1
-+  fi
- fi
- 
- # skin touched
-@@ -2661,7 +2696,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
-     sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
-   fi
-   set +x
--], [$DISABLE_PROJECTM])
-+], [$DISABLE_INTERNAL_PROJECTM])
- 
- XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
-   ./configure  \
-diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
-index 249338c..2c16306 100644
---- a/xbmc/visualizations/XBMCProjectM/Makefile.in
-+++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
-@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
- libprojectM/libprojectM.dylib:
- 	$(MAKE) -C libprojectM
- else
--$(SLIB): $(OBJS) libprojectM/libprojectM.so
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
-+$(SLIB): $(OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o @PROJECTM_LIBS@ -o $(SLIB)
- 	$(MAKE) $(PRESETS)
--
--libprojectM/libprojectM.so: 
--	$(MAKE) -C libprojectM
- endif
- 
--$(PRESETS): libprojectM/presets/*
--	zip -j $@ libprojectM/presets/*
-+$(PRESETS):
-+	zip -j $@ @PROJECTM_PRESETS_DIR@/*
-+
- 
- CLEAN_FILES = \
- 	libprojectM/libprojectM.so \
--- 
-1.8.1.5
-
diff --git a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
deleted file mode 100644
index a404bbe7bfd1..000000000000
--- a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 57b29a277ca8d87bdfe4d6865eb23441b133ae52 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Sat, 23 Feb 2013 11:21:44 +0100
-Subject: [PATCH] Allow usage of system ProjectM
-
----
- configure.in                                 | 45 ++++++++++++++++++++++++----
- xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
- 2 files changed, 45 insertions(+), 12 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index db1d012..3e11588 100644
---- a/configure.in
-+++ b/configure.in
-@@ -310,9 +310,15 @@ AC_ARG_ENABLE([fishbmc],
- 
- AC_ARG_ENABLE([projectm],
-   [AS_HELP_STRING([--enable-projectm],
--  [enable ProjectM visualisation (default is yes)])],
-+  [enable ProjectM visualisation (default is auto)])],
-   [use_projectm=$enableval],
--  [use_projectm=yes])
-+  [use_projectm=auto])
-+
-+AC_ARG_WITH([projectm-presets-dir],
-+  [AS_HELP_STRING([--with-projectm-presets-dir],
-+  [path to ProjectM presets to incude in default list (default is bundled path)])],
-+  [projectm_presets_dir=$withval],
-+  [projectm_presets_dir=bundled])
- 
- AC_ARG_ENABLE([x11],
-   [AS_HELP_STRING([--enable-x11],
-@@ -1313,10 +1319,39 @@ fi
- if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
-   AC_MSG_NOTICE($projectm_disabled)
-   DISABLE_PROJECTM=1
-+  DISABLE_INTERNAL_PROJECTM=1
-   use_projectm="no"
- else
--  AC_MSG_NOTICE($projectm_enabled)
--  DISABLE_PROJECTM=0
-+  if test "$host_vendor" != "apple" ; then
-+    if test "$use_projectm" = "yes"; then
-+      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
-+    else
-+      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
-+    fi
-+    if test "$use_projectm" != "no"; then
-+      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
-+    fi
-+    DISABLE_INTERNAL_PROJECTM=1
-+  else
-+    DISABLE_INTERNAL_PROJECTM=0
-+  fi
-+  if test "$use_projectm" != "no"; then
-+    AC_MSG_NOTICE($projectm_enabled)
-+    DISABLE_PROJECTM=0
-+    # verify preset dir actually exist if user don't want to use bundled one
-+    if test "$projectm_presets_dir" != "bundled" ; then
-+      if ! test -d "$projectm_presets_dir"; then
-+        AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
-+      fi
-+      PROJECTM_PRESETS_DIR=$projectm_presets_dir
-+    else
-+      PROJECTM_PRESETS_DIR=libprojectM/presets/
-+    fi
-+    AC_SUBST(PROJECTM_PRESETS_DIR)
-+  else
-+    AC_MSG_NOTICE($projectm_disabled)
-+    DISABLE_PROJECTM=1
-+  fi
- fi
- 
- # skin touched
-@@ -2712,7 +2747,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
-     sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
-   fi
-   set +x
--], [$DISABLE_PROJECTM])
-+], [$DISABLE_INTERNAL_PROJECTM])
- 
- XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
-   ./configure  \
-diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
-index 249338c..2c16306 100644
---- a/xbmc/visualizations/XBMCProjectM/Makefile.in
-+++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
-@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
- libprojectM/libprojectM.dylib:
- 	$(MAKE) -C libprojectM
- else
--$(SLIB): $(OBJS) libprojectM/libprojectM.so
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
-+$(SLIB): $(OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o @PROJECTM_LIBS@ -o $(SLIB)
- 	$(MAKE) $(PRESETS)
--
--libprojectM/libprojectM.so: 
--	$(MAKE) -C libprojectM
- endif
- 
--$(PRESETS): libprojectM/presets/*
--	zip -j $@ libprojectM/presets/*
-+$(PRESETS):
-+	zip -j $@ @PROJECTM_PRESETS_DIR@/*
-+
- 
- CLEAN_FILES = \
- 	libprojectM/libprojectM.so \
--- 
-1.8.1.5
-
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
index 5e6ee3a14317..23387e1c0241 100644
--- a/media-tv/xbmc/xbmc-12.1-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.2 2013/04/23 01:33:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.3 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ case ${PV} in
 *)
 	MY_P=${P/_/-*_}
 	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 	;;
 esac
 
@@ -149,7 +149,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-12.0-system-projectm.patch
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure
 
@@ -234,6 +233,7 @@ src_configure() {
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
+		--with-projectm-presets-dir="${EPREFIX}/usr/share/projectM/presets/" \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable pvr mythtv) \
 		$(use_enable rsxs) \
diff --git a/media-tv/xbmc/xbmc-12.2-r1.ebuild b/media-tv/xbmc/xbmc-12.2-r1.ebuild
index f6657914479b..eb17d8ba0bee 100644
--- a/media-tv/xbmc/xbmc-12.2-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.4 2013/06/27 18:08:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.5 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -149,7 +149,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-12.0-system-projectm.patch
 	# Backported fixes
 	EPATCH_MULTI_MSG="Applying patches backported from master..." \
 		EPATCH_SUFFIX="patch" \
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index c82983df80b8..85f55d208a00 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.146 2013/06/14 16:36:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.147 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -147,7 +147,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-13.0-system-projectm.patch
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure