From 87d756375fb31a14f52189bd3c2cf18d296a3589 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Dec 2009 10:01:20 +0100 Subject: [PATCH] xscreensaver: use INC_PR, bump for mesa -> virtual/libgl change --- recipes/xscreensaver/xscreensaver.inc | 2 ++ recipes/xscreensaver/xscreensaver_4.16.bb | 2 +- recipes/xscreensaver/xscreensaver_4.22.bb | 2 +- recipes/xscreensaver/xscreensaver_5.07.bb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes/xscreensaver/xscreensaver.inc b/recipes/xscreensaver/xscreensaver.inc index 628f1207aa..2f8711fee6 100644 --- a/recipes/xscreensaver/xscreensaver.inc +++ b/recipes/xscreensaver/xscreensaver.inc @@ -12,6 +12,8 @@ DEPENDS = "intltool virtual/libgl freeglut virtual/libx11 gtk+ libxml2 libglade" LDFLAGS_append = " -Wl,--export-dynamic" TARGET_CC_ARCH += "${LDFLAGS}" +INC_PR = "r4" + inherit autotools export INTLTOOL_PERL="/usr/bin/env perl" diff --git a/recipes/xscreensaver/xscreensaver_4.16.bb b/recipes/xscreensaver/xscreensaver_4.16.bb index 7696c4733c..e72ce92645 100644 --- a/recipes/xscreensaver/xscreensaver_4.16.bb +++ b/recipes/xscreensaver/xscreensaver_4.16.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.jwz.org/xscreensaver/" SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" -PR = "r1" +PR = "${INC_PR}.0" BROKEN = "1" # upstream is at 4.22 now - patches do not apply diff --git a/recipes/xscreensaver/xscreensaver_4.22.bb b/recipes/xscreensaver/xscreensaver_4.22.bb index cac3776724..1d184e9f2b 100644 --- a/recipes/xscreensaver/xscreensaver_4.22.bb +++ b/recipes/xscreensaver/xscreensaver_4.22.bb @@ -8,7 +8,7 @@ SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://fixes.patch;patch=1 \ diff --git a/recipes/xscreensaver/xscreensaver_5.07.bb b/recipes/xscreensaver/xscreensaver_5.07.bb index cfe5cccdaa..ab810a7e0e 100644 --- a/recipes/xscreensaver/xscreensaver_5.07.bb +++ b/recipes/xscreensaver/xscreensaver_5.07.bb @@ -1,5 +1,5 @@ require xscreensaver.inc -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ -- 2.39.5