public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-12.0-system-projectm.patch xbmc-13.0-system-projectm.patch
@ 2013-07-06 12:12 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-07-06 12:12 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/07/06 12:12:04

  Removed:              xbmc-12.0-system-projectm.patch
                        xbmc-13.0-system-projectm.patch
  Log:
  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)


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-12.0-system-projectm.patch xbmc-13.0-system-projectm.patch
@ 2013-07-06 11:25 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-07-06 11:25 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/07/06 11:25:27

  Modified:             xbmc-12.0-system-projectm.patch
                        xbmc-13.0-system-projectm.patch
  Log:
  Ensure libprojectM is linked on projectM extension. Still crashes tho with 2.1 more investigation needed. Force due to unsynced cvs.
  
  (Portage version: 2.2.0_alpha186/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.2                  media-tv/xbmc/files/xbmc-12.0-system-projectm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch?r1=1.1&r2=1.2

Index: xbmc-12.0-system-projectm.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-12.0-system-projectm.patch	20 Apr 2013 17:22:26 -0000	1.1
+++ xbmc-12.0-system-projectm.patch	6 Jul 2013 11:25:26 -0000	1.2
@@ -47,7 +47,7 @@
 +      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"
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
 +    fi
 +    DISABLE_INTERNAL_PROJECTM=1
 +  else
@@ -93,7 +93,7 @@
 -$(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 -o $(SLIB)
++	$(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: 



1.3                  media-tv/xbmc/files/xbmc-13.0-system-projectm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch?r1=1.2&r2=1.3

Index: xbmc-13.0-system-projectm.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-13.0-system-projectm.patch	24 Apr 2013 16:18:37 -0000	1.2
+++ xbmc-13.0-system-projectm.patch	6 Jul 2013 11:25:26 -0000	1.3
@@ -46,7 +46,7 @@
 +      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"
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
 +    fi
 +    DISABLE_INTERNAL_PROJECTM=1
 +  else
@@ -92,7 +92,7 @@
 -$(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 -o $(SLIB)
++	$(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: 





^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-12.0-system-projectm.patch xbmc-13.0-system-projectm.patch
@ 2013-04-20 17:22 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-04-20 17:22 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/04/20 17:22:26

  Added:                xbmc-12.0-system-projectm.patch
                        xbmc-13.0-system-projectm.patch
  Log:
  Update to python-single-r1 wrt bug#458682. Apply projectm unbundle patch. Apply libav patchset provided by Anton Khirnov to 12.1-r1 ebuild and remove keywords as it depends on too new ffmpeg/libav with this. (the patchset still needs few touchups before submitting to master/9999 ebuild)
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.1                  media-tv/xbmc/files/xbmc-12.0-system-projectm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch?rev=1.1&content-type=text/plain

Index: xbmc-12.0-system-projectm.patch
===================================================================
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"
+    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 -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




1.1                  media-tv/xbmc/files/xbmc-13.0-system-projectm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch?rev=1.1&content-type=text/plain

Index: xbmc-13.0-system-projectm.patch
===================================================================
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"
+    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 -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






^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-06 12:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-06 12:12 [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-12.0-system-projectm.patch xbmc-13.0-system-projectm.patch Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2013-07-06 11:25 Tomas Chvatal (scarabeus)
2013-04-20 17:22 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox