diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/debian/changelog vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog --- vdr-plugin-skinenigmang-0.1.2+git20180128/debian/changelog 2019-07-20 09:39:07.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog 2019-07-20 16:25:17.000000000 +0000 @@ -1,15 +1,16 @@ -vdr-plugin-skinenigmang (0.1.2+git20180128-2.1build1) eoan; urgency=medium +vdr-plugin-skinenigmang (0.1.2+git20190720-1build1) eoan; urgency=medium * Rebuild against new vdr 2.4.1. - -- Gianfranco Costamagna Sat, 20 Jul 2019 11:39:07 +0200 + -- Gianfranco Costamagna Sat, 20 Jul 2019 18:25:17 +0200 -vdr-plugin-skinenigmang (0.1.2+git20180128-2.1) unstable; urgency=low +vdr-plugin-skinenigmang (0.1.2+git20190720-1) unstable; urgency=medium - * Non-maintainer upload. - * Fix FTBFS without freetype-config. (Closes: #915353) + * New Upstream Snapshot (commit 995b108) + * Dropped vdr-plugin-skinenigma_min_max_from_stl.patch + * Use pkg-config for freetype - -- Adrian Bunk Mon, 31 Dec 2018 18:17:16 +0200 + -- Tobias Grimm Sat, 20 Jul 2019 06:00:11 +0200 vdr-plugin-skinenigmang (0.1.2+git20180128-2) unstable; urgency=medium diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/no-freetype-config vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/no-freetype-config --- vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/no-freetype-config 2018-12-31 16:17:16.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/no-freetype-config 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: freetype-config was removed in Debian, switch to pkg-config -Author: Adrian Bunk - ---- vdr-plugin-skinenigmang-0.1.2+git20180128.orig/Makefile -+++ vdr-plugin-skinenigmang-0.1.2+git20180128/Makefile -@@ -138,9 +138,9 @@ INCLUDES += $(shell pkg-config --cflags - endif - endif - --ifneq ($(shell which freetype-config),) -- INCLUDES += $(shell freetype-config --cflags) -- LIBS += $(shell freetype-config --libs) -+ifneq ($(shell which pkg-config),) -+ INCLUDES += $(shell pkg-config --cflags freetype2) -+ LIBS += $(shell pkg-config --libs freetype2) - else - INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype - LIBS += -lfreetype diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/series vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series --- vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/series 2018-12-31 16:17:16.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series 2019-07-20 04:00:11.000000000 +0000 @@ -1,3 +1,2 @@ fix-imagemagick-path.patch -vdr-plugin-skinenigma_min_max_from_stl.patch -no-freetype-config +use-pkg-config-for-freetype.diff diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/use-pkg-config-for-freetype.diff vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/use-pkg-config-for-freetype.diff --- vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/use-pkg-config-for-freetype.diff 1970-01-01 00:00:00.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/use-pkg-config-for-freetype.diff 2019-07-20 04:00:11.000000000 +0000 @@ -0,0 +1,18 @@ +--- a/Makefile ++++ b/Makefile +@@ -138,13 +138,8 @@ + endif + endif + +-ifneq ($(shell which freetype-config),) +- INCLUDES += $(shell freetype-config --cflags) +- LIBS += $(shell freetype-config --libs) +-else +- INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype +- LIBS += -lfreetype +-endif ++INCLUDES += $(shell pkg-config --cflags freetype2) ++LIBS += $(shell pkg-config --libs freetype2) + + ### The main target: + diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch --- vdr-plugin-skinenigmang-0.1.2+git20180128/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch 2018-04-15 17:43:46.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Index: b/enigma.c -=================================================================== ---- a/enigma.c -+++ b/enigma.c -@@ -1380,7 +1380,7 @@ - } - - lineHeight = pFontList->Height(); -- nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap -+ nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap - xItemLeft = xBodyLeft + (EnigmaConfig.showMarker ? lineHeight : ListHBorder); - xItemRight = (fShowLogo || fShowInfo ? xBodyRight : xInfoRight) - ListHBorder - SmallGap - SmallGap - SmallGap; - int numItems = MaxItems(); -@@ -3808,7 +3808,7 @@ - } - - lineHeight = pFontListItem->Height(); -- nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap -+ nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap - int LogoSize = IconHeight; - LogoSize += (LogoSize % 2 ? 1 : 0); - currentIndex = -1; diff -Nru vdr-plugin-skinenigmang-0.1.2+git20180128/enigma.c vdr-plugin-skinenigmang-0.1.2+git20190720/enigma.c --- vdr-plugin-skinenigmang-0.1.2+git20180128/enigma.c 2018-01-28 15:31:45.000000000 +0000 +++ vdr-plugin-skinenigmang-0.1.2+git20190720/enigma.c 2019-07-20 03:43:03.000000000 +0000 @@ -1380,7 +1380,7 @@ } lineHeight = pFontList->Height(); - nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap + nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap xItemLeft = xBodyLeft + (EnigmaConfig.showMarker ? lineHeight : ListHBorder); xItemRight = (fShowLogo || fShowInfo ? xBodyRight : xInfoRight) - ListHBorder - SmallGap - SmallGap - SmallGap; int numItems = MaxItems(); @@ -3808,7 +3808,7 @@ } lineHeight = pFontListItem->Height(); - nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap + nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap int LogoSize = IconHeight; LogoSize += (LogoSize % 2 ? 1 : 0); currentIndex = -1;