Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3140 from wsnipex/binary-addons

Make waveform and spectrum visualizations optional and stop installing unwanted stuff
  • Loading branch information...
commit 3c880ef11fdb681702ed979de59c62b06597d7f2 2 parents 4771ab5 + d5243db
Martijn Kaijser MartijnKaijser authored
Showing with 84 additions and 5 deletions.
  1. +36 −5 Makefile.in
  2. +48 −0 configure.in
41 Makefile.in
View
@@ -1,5 +1,9 @@
include bootstrap.mk
+null :=
+space := ${null} ${null}
+${space} := ${space}
+
AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@
EC_DIRS= \
@@ -123,6 +127,9 @@ ifeq (@USE_MDNSEMBEDDED@,1)
DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a
endif
+INSTALL_FILTER = .*visualization\.dxspectrum.*
+INSTALL_FILTER += .*visualization\.milkdrop.*
+
ifeq ($(findstring osx,@ARCH@),osx)
DIRECTORY_ARCHIVES += xbmc/osx/osx.a
DIRECTORY_ARCHIVES += xbmc/network/osx/network.a
@@ -130,7 +137,13 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
DIRECTORY_ARCHIVES += xbmc/powermanagement/osx/powermanagement.a
DIRECTORY_ARCHIVES += xbmc/storage/osx/storage.a
DIRECTORY_ARCHIVES += xbmc/windowing/osx/windowing_osx.a
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
else
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
+INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.*
ifeq (@USE_ANDROID@,1)
DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
@@ -145,6 +158,7 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a
DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
endif
endif
@@ -207,21 +221,38 @@ endif
SS_DIRS=
ifneq (@DISABLE_RSXS@,1)
SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+else
+ INSTALL_FILTER+= .*screensaver\.rsxs.*
endif
-VIS_DIRS=xbmc/visualizations/OpenGLSpectrum \
- xbmc/visualizations/WaveForm
+ifneq (@DISABLE_SPECTRUM@,1)
+ VIS_DIRS+= xbmc/visualizations/OpenGLSpectrum
+else
+ INSTALL_FILTER+= .*visualization\.glspectrum.*
+endif
+
+ifneq (@DISABLE_WAVEFORM@,1)
+ VIS_DIRS+= xbmc/visualizations/WaveForm
+else
+ INSTALL_FILTER+= .*visualization\.waveform.*
+endif
ifneq (@DISABLE_FISHBMC@,1)
VIS_DIRS+= xbmc/visualizations/fishBMC
+else
+ INSTALL_FILTER+= .*visualization\.fishbmc.*
endif
ifneq (@DISABLE_PROJECTM@,1)
VIS_DIRS+= xbmc/visualizations/XBMCProjectM
+else
+ INSTALL_FILTER+= .*visualization\.projectm.*
endif
ifneq (@DISABLE_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
+else
+ INSTALL_FILTER+= .*visualization\.goom.*
endif
LIBADDON_DIRS=\
@@ -565,7 +596,7 @@ install-datas: install-scripts
@# Arch independent files
ifeq ($(findstring bsd,@ARCH@), bsd)
@find -E addons language media sounds userdata system -type f \
- -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+ -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
@@ -573,13 +604,13 @@ ifeq ($(findstring bsd,@ARCH@), bsd)
else
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
@find -E addons language media sounds userdata system -type f \
- -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
+ -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
- @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
endif
@# Icons and links
48 configure.in
View
@@ -116,6 +116,10 @@ missing_headers="Could not find some required headers. Please see the README for
missing_program="Could not find a required program. Please see the README for your platform."
xrandr_not_found="== Could not find libXRandR. SDL will be used for resolution support. =="
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
+waveform_enabled="== WAVEFORM enabled =="
+waveform_disabled="== WAVEFORM disabled =="
+spectrum_enabled="== SPECTRUM enabled =="
+spectrum_disabled="== SPECTRUM disabled =="
goom_enabled="== GOOM enabled. =="
goom_disabled="== GOOM disabled. =="
alsa_disabled="== ALSA support disabled. =="
@@ -300,6 +304,18 @@ AC_ARG_ENABLE([xrandr],
[use_xrandr=$enableval],
[use_xrandr=yes])
+AC_ARG_ENABLE([waveform],
+ [AS_HELP_STRING([--enable-waveform],
+ [enable Waveform visualisation (default is yes)])],
+ [use_waveform=$enableval],
+ [use_waveform=yes])
+
+AC_ARG_ENABLE([spectrum],
+ [AS_HELP_STRING([--enable-spectrum],
+ [enable Spectrum visualisation (default is yes)])],
+ [use_spectrum=$enableval],
+ [use_spectrum=yes])
+
AC_ARG_ENABLE([goom],
[AS_HELP_STRING([--enable-goom],
[enable GOOM visualisation (default is no)])],
@@ -1304,6 +1320,24 @@ else
fi
fi
+# WAVEFORM
+if test "$use_waveform" = "yes"; then
+ AC_MSG_NOTICE($waveform_enabled)
+ DISABLE_WAVEFORM=0
+else
+ AC_MSG_NOTICE($waveform_disabled)
+ DISABLE_WAVEFORM=1
+fi
+
+# SPECTRUM
+if test "$use_spectrum" = "yes"; then
+ AC_MSG_NOTICE($spectrum_enabled)
+ DISABLE_SPECTRUM=0
+else
+ AC_MSG_NOTICE($spectrum_disabled)
+ DISABLE_SPECTRUM=1
+fi
+
# GOOM
if test "$host_vendor" = "apple" ; then
AC_MSG_NOTICE($goom_disabled)
@@ -2005,6 +2039,18 @@ else
USE_XRANDR=0
fi
+if test "$use_waveform" = "yes"; then
+ final_message="$final_message\n Waveform:\tYes"
+else
+ final_message="$final_message\n Waveform:\tNo"
+fi
+
+if test "$use_spectrum" = "yes"; then
+ final_message="$final_message\n Spectrum:\tYes"
+else
+ final_message="$final_message\n Spectrum:\tNo"
+fi
+
if test "$use_goom" = "yes"; then
final_message="$final_message\n GOOM:\t\tYes"
else
@@ -2423,6 +2469,8 @@ AC_SUBST(INCLUDES)
AC_SUBST(LDFLAGS)
AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
+AC_SUBST(DISABLE_WAVEFORM)
+AC_SUBST(DISABLE_SPECTRUM)
AC_SUBST(DISABLE_GOOM)
AC_SUBST(DISABLE_RSXS)
AC_SUBST(DISABLE_FISHBMC)
Please sign in to comment.
Something went wrong with that request. Please try again.