[SCM] kodi/master: Drop workarounds for screensavers dropped by upstream
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Mon Feb 8 10:39:09 UTC 2016
The following commit has been merged in the master branch:
commit 617431cca9b07a802a0fcd089ddb6c93c60a7eba
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sun Feb 7 22:09:54 2016 +0100
Drop workarounds for screensavers dropped by upstream
diff --git a/debian/rules b/debian/rules
index e914f54..f554322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
ARCH_SPECIFIC_LIB_RECOMMENDS += $(ARCH_SPECIFIC_LIB_RECOMMENDS_ADD)
# Various environment variables to set
-export DEB_LDFLAGS_MAINT_APPEND = $(shell pkg-config --libs ftgl) -latomic
+export DEB_LDFLAGS_MAINT_APPEND = -latomic
# List of options to pass to configure. Can be overridden.
# Extra options can simply be passed using KODI_CONFIG_EXTRA_OPTIONS env
@@ -89,9 +89,6 @@ endif
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/utils/SystemInfo.cpp
- mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
- -ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
- -ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
fontforge -script $(CURDIR)/debian/mergefonts.ff \
/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
$(DEJAVUSANS) \
@@ -115,13 +112,6 @@ override_dh_install:
-XRoboto-Bold.ttf -XRoboto-Regular.ttf -XNOTICE.txt \
-Xjquery-1.8.2.min.js -Xiscroll-min.js
-override_dh_makeshlibs:
- # We don't install shared libraries in standard locations so don't run
- # dh_makeshlibs
- # OTOH we need to remove exec flag after dh_strip
- chmod -x $(CURDIR)/debian/tmp/usr/lib/*/kodi/addons/visualization.*/*.vis
- -chmod -x $(CURDIR)/debian/tmp/usr/lib/*/kodi/addons/screensaver.rsxs.*/*.xbs
-
override_dh_shlibdeps: debian/tmp/kodi-bin-depends-dummy.so debian/tmp/kodi-bin-recommends-dummy.so
dh_shlibdeps -a -O--parallel \
-l$(CURDIR)/debian/kodi-bin/usr/lib/*/kodi/system/players/dvdplayer
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list