Skip to content
This repository
Browse code

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 authored August 26, 2013

Showing 2 changed files with 84 additions and 5 deletions. Show diff stats Hide diff stats

  1. 41  Makefile.in
  2. 48  configure.in
41  Makefile.in
... ...
@@ -1,5 +1,9 @@
1 1
 include bootstrap.mk
2 2
 
  3
+null :=
  4
+space := ${null} ${null}
  5
+${space} := ${space}
  6
+
3 7
 AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@
4 8
 
5 9
 EC_DIRS= \
@@ -123,6 +127,9 @@ ifeq (@USE_MDNSEMBEDDED@,1)
123 127
 DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a
124 128
 endif
125 129
 
  130
+INSTALL_FILTER = .*visualization\.dxspectrum.*
  131
+INSTALL_FILTER += .*visualization\.milkdrop.*
  132
+
126 133
 ifeq ($(findstring osx,@ARCH@),osx)
127 134
 DIRECTORY_ARCHIVES += xbmc/osx/osx.a
128 135
 DIRECTORY_ARCHIVES += xbmc/network/osx/network.a
@@ -130,7 +137,13 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
130 137
 DIRECTORY_ARCHIVES += xbmc/powermanagement/osx/powermanagement.a
131 138
 DIRECTORY_ARCHIVES += xbmc/storage/osx/storage.a
132 139
 DIRECTORY_ARCHIVES += xbmc/windowing/osx/windowing_osx.a
  140
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
  141
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
  142
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
133 143
 else
  144
+INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
  145
+INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
  146
+INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.*
134 147
 ifeq (@USE_ANDROID@,1)
135 148
 DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
136 149
 DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
@@ -145,6 +158,7 @@ DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
145 158
 DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a
146 159
 DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
147 160
 DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
  161
+INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
148 162
 endif
149 163
 endif
150 164
 
@@ -207,21 +221,38 @@ endif
207 221
 SS_DIRS=
208 222
 ifneq (@DISABLE_RSXS@,1)
209 223
   SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
  224
+else
  225
+  INSTALL_FILTER+= .*screensaver\.rsxs.*
210 226
 endif
211 227
 
212  
-VIS_DIRS=xbmc/visualizations/OpenGLSpectrum \
213  
-         xbmc/visualizations/WaveForm
  228
+ifneq (@DISABLE_SPECTRUM@,1)
  229
+  VIS_DIRS+= xbmc/visualizations/OpenGLSpectrum
  230
+else
  231
+  INSTALL_FILTER+= .*visualization\.glspectrum.*
  232
+endif
  233
+
  234
+ifneq (@DISABLE_WAVEFORM@,1)
  235
+  VIS_DIRS+= xbmc/visualizations/WaveForm
  236
+else
  237
+  INSTALL_FILTER+= .*visualization\.waveform.*
  238
+endif
214 239
 
215 240
 ifneq (@DISABLE_FISHBMC@,1)
216 241
   VIS_DIRS+= xbmc/visualizations/fishBMC
  242
+else
  243
+  INSTALL_FILTER+= .*visualization\.fishbmc.*
217 244
 endif
218 245
 
219 246
 ifneq (@DISABLE_PROJECTM@,1)
220 247
   VIS_DIRS+= xbmc/visualizations/XBMCProjectM
  248
+else
  249
+  INSTALL_FILTER+= .*visualization\.projectm.*
221 250
 endif
222 251
 
223 252
 ifneq (@DISABLE_GOOM@,1)
224 253
   VIS_DIRS+=xbmc/visualizations/Goom
  254
+else
  255
+  INSTALL_FILTER+= .*visualization\.goom.*
225 256
 endif
226 257
 
227 258
 LIBADDON_DIRS=\
@@ -565,7 +596,7 @@ install-datas: install-scripts
565 596
 	@# Arch independent files
566 597
 ifeq ($(findstring bsd,@ARCH@), bsd)
567 598
 	@find -E addons language media sounds userdata system -type f \
568  
-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
  599
+		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
569 600
 		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
570 601
 		-and \
571 602
 		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
@@ -573,13 +604,13 @@ ifeq ($(findstring bsd,@ARCH@), bsd)
573 604
 else
574 605
 ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
575 606
 	@find -E addons language media sounds userdata system -type f \
576  
-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
  607
+		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
577 608
 		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
578 609
 		-and \
579 610
 		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
580 611
 		-exec printf " -- %-75.75s\r" "{}" \;
581 612
 else
582  
-	@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"
  613
+	@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"
583 614
 endif
584 615
 endif
585 616
 	@# Icons and links
48  configure.in
@@ -116,6 +116,10 @@ missing_headers="Could not find some required headers. Please see the README for
116 116
 missing_program="Could not find a required program. Please see the README for your platform."
117 117
 xrandr_not_found="== Could not find libXRandR. SDL will be used for resolution support. =="
118 118
 xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
  119
+waveform_enabled="== WAVEFORM enabled =="
  120
+waveform_disabled="== WAVEFORM disabled =="
  121
+spectrum_enabled="== SPECTRUM enabled =="
  122
+spectrum_disabled="== SPECTRUM disabled =="
119 123
 goom_enabled="== GOOM enabled. =="
120 124
 goom_disabled="== GOOM disabled. =="
121 125
 alsa_disabled="== ALSA support disabled. =="
@@ -300,6 +304,18 @@ AC_ARG_ENABLE([xrandr],
300 304
   [use_xrandr=$enableval],
301 305
   [use_xrandr=yes])
302 306
 
  307
+AC_ARG_ENABLE([waveform],
  308
+  [AS_HELP_STRING([--enable-waveform],
  309
+  [enable Waveform visualisation (default is yes)])],
  310
+  [use_waveform=$enableval],
  311
+  [use_waveform=yes])
  312
+
  313
+AC_ARG_ENABLE([spectrum],
  314
+  [AS_HELP_STRING([--enable-spectrum],
  315
+  [enable Spectrum visualisation (default is yes)])],
  316
+  [use_spectrum=$enableval],
  317
+  [use_spectrum=yes])
  318
+
303 319
 AC_ARG_ENABLE([goom],
304 320
   [AS_HELP_STRING([--enable-goom],
305 321
   [enable GOOM visualisation (default is no)])],
@@ -1304,6 +1320,24 @@ else
1304 1320
   fi
1305 1321
 fi
1306 1322
 
  1323
+# WAVEFORM
  1324
+if test "$use_waveform" = "yes"; then
  1325
+  AC_MSG_NOTICE($waveform_enabled)
  1326
+    DISABLE_WAVEFORM=0
  1327
+else
  1328
+  AC_MSG_NOTICE($waveform_disabled)
  1329
+  DISABLE_WAVEFORM=1
  1330
+fi
  1331
+
  1332
+# SPECTRUM
  1333
+if test "$use_spectrum" = "yes"; then
  1334
+  AC_MSG_NOTICE($spectrum_enabled)
  1335
+    DISABLE_SPECTRUM=0
  1336
+else
  1337
+  AC_MSG_NOTICE($spectrum_disabled)
  1338
+  DISABLE_SPECTRUM=1
  1339
+fi
  1340
+
1307 1341
 # GOOM
1308 1342
 if test "$host_vendor" = "apple" ; then
1309 1343
   AC_MSG_NOTICE($goom_disabled)
@@ -2005,6 +2039,18 @@ else
2005 2039
   USE_XRANDR=0
2006 2040
 fi
2007 2041
 
  2042
+if test "$use_waveform" = "yes"; then
  2043
+  final_message="$final_message\n  Waveform:\tYes"
  2044
+else
  2045
+  final_message="$final_message\n  Waveform:\tNo"
  2046
+fi
  2047
+
  2048
+if test "$use_spectrum" = "yes"; then
  2049
+  final_message="$final_message\n  Spectrum:\tYes"
  2050
+else
  2051
+  final_message="$final_message\n  Spectrum:\tNo"
  2052
+fi
  2053
+
2008 2054
 if test "$use_goom" = "yes"; then
2009 2055
   final_message="$final_message\n  GOOM:\t\tYes"
2010 2056
 else
@@ -2423,6 +2469,8 @@ AC_SUBST(INCLUDES)
2423 2469
 AC_SUBST(LDFLAGS)
2424 2470
 AC_SUBST(SDL_DEFINES)
2425 2471
 AC_SUBST(BUILD_DVDCSS)
  2472
+AC_SUBST(DISABLE_WAVEFORM)
  2473
+AC_SUBST(DISABLE_SPECTRUM)
2426 2474
 AC_SUBST(DISABLE_GOOM)
2427 2475
 AC_SUBST(DISABLE_RSXS)
2428 2476
 AC_SUBST(DISABLE_FISHBMC)

0 notes on commit 3c880ef

Please sign in to comment.
Something went wrong with that request. Please try again.