patch-Makefile_in 3.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. --- xbmc-13.1.orig/Makefile.in 2014-06-08 08:40:24.000000000 +0200
  2. +++ xbmc-13.1/Makefile.in 2014-06-09 11:14:17.917685925 +0200
  3. @@ -191,13 +191,7 @@ ifeq (@USE_LIBAV_HACKS@,1)
  4. DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
  5. endif
  6. -PAPCODECS_DIRS= \
  7. - lib/nosefart \
  8. - lib/timidity \
  9. - lib/libsidplay2 \
  10. - lib/stsound/StSoundLibrary \
  11. - lib/snesapu/SNES/SNESAPU \
  12. - lib/vgmstream
  13. +PAPCODECS_DIRS=
  14. ifeq (@USE_ASAP_CODEC@,1)
  15. PAPCODECS_DIRS+= \
  16. @@ -419,21 +413,11 @@ libhdhomerun: dllloader
  17. $(MAKE) -C lib/libhdhomerun
  18. papcodecs: dllloader dvdpcodecs
  19. test -d system/players/paplayer || mkdir system/players/paplayer
  20. - $(MAKE) -C lib/vgmstream
  21. - $(MAKE) -C lib/timidity
  22. - $(MAKE) -C lib/nosefart
  23. -ifneq ($(findstring arm-osx,@ARCH@), arm-osx)
  24. - $(MAKE) -C lib/libsidplay2
  25. -endif
  26. ifeq (@USE_ASAP_CODEC@,1)
  27. ifneq ($(findstring osx,@ARCH@), osx)
  28. $(MAKE) -C lib/asap asap-xbmc
  29. endif
  30. endif
  31. - $(MAKE) -C lib/stsound/StSoundLibrary
  32. -ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
  33. - $(MAKE) -C lib/snesapu/SNES/SNESAPU
  34. -endif
  35. imagelib: dllloader
  36. $(MAKE) -C lib/cximage-6.0
  37. @@ -586,25 +570,7 @@ install-arch:
  38. ifeq (@USE_PVR_ADDONS@,1)
  39. $(MAKE) -C pvr-addons install
  40. endif
  41. -ifeq ($(findstring freebsd,@ARCH@), freebsd)
  42. - @find -E system addons -type f -not -iregex ".*svn.*" \
  43. - -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
  44. - -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
  45. - -and \
  46. - -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
  47. - -exec printf " -- %-75.75s\r" "{}" \;
  48. -else
  49. -ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
  50. - @find -E system addons -type f -not -iregex ".*svn.*" \
  51. - -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
  52. - -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
  53. - -and \
  54. - -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
  55. - -exec printf " -- %-75.75s\r" "{}" \;
  56. -else
  57. @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
  58. -endif
  59. -endif
  60. install-scripts:
  61. @install -d $(DESTDIR)$(bindir)
  62. @@ -624,26 +590,7 @@ install-datas: install-scripts
  63. @echo "Done!"
  64. @echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
  65. @install -d $(DESTDIR)$(datarootdir)/xbmc
  66. - @# Arch independent files
  67. -ifeq ($(findstring bsd,@ARCH@), bsd)
  68. - @find -E addons language media sounds userdata system -type f \
  69. - -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
  70. - -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
  71. - -and \
  72. - -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
  73. - -exec printf " -- %-75.75s\r" "{}" \;
  74. -else
  75. -ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
  76. - @find -E addons language media sounds userdata system -type f \
  77. - -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
  78. - -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
  79. - -and \
  80. - -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
  81. - -exec printf " -- %-75.75s\r" "{}" \;
  82. -else
  83. @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"
  84. -endif
  85. -endif
  86. @# Icons and links
  87. @install -d $(DESTDIR)$(datarootdir)/applications
  88. @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop