Revision: 9041
http://playerstage.svn.sourceforge.net/playerstage/?rev=9041&view=rev
Author: thjc
Date: 2011-03-29 09:42:13 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
add package update for stage 4.0.1
Modified Paths:
--------------
packages/debian/stage/debian/changelog
packages/debian/stage/debian/control
packages/debian/stage/debian/rules
Added Paths:
-----------
packages/debian/stage/debian/patches/
packages/debian/stage/debian/patches/multiline_removal
packages/debian/stage/debian/patches/series
Modified: packages/debian/stage/debian/changelog
===================================================================
--- packages/debian/stage/debian/changelog 2011-03-28 09:20:41 UTC (rev
9040)
+++ packages/debian/stage/debian/changelog 2011-03-29 09:42:13 UTC (rev
9041)
@@ -1,8 +1,10 @@
-stage (4.0.0-1~ppa4) maverick; urgency=low
+stage (4.0.1-1~ppa1) natty; urgency=low
- * wrong distribution target
+ * Upstream release
+ * fix missing controller libraries
+ * add patch to conditionall compile multiline graphics code
- -- Toby Collett <[email protected]> Mon, 28 Mar 2011 11:12:01 +0200
+ -- Toby Collett <[email protected]> Mon, 28 Mar 2011 09:55:02 +0200
stage (4.0.0-1~ppa2) maverick; urgency=low
Modified: packages/debian/stage/debian/control
===================================================================
--- packages/debian/stage/debian/control 2011-03-28 09:20:41 UTC (rev
9040)
+++ packages/debian/stage/debian/control 2011-03-29 09:42:13 UTC (rev
9041)
@@ -3,7 +3,7 @@
Maintainer: Ubuntu MOTU Developers <[email protected]>
Uploaders: Toby Collett <[email protected]>
XSBC-Original-Maintainer: Michael Janssen <[email protected]>
-Build-Depends: debhelper (>= 7), cdbs, cmake, libplayercore3-dev (>= 3.0),
libltdl7-dev, libfltk1.1-dev, libpng-dev, freeglut3-dev, pkg-config
+Build-Depends: debhelper (>= 7), cdbs, cmake, libplayercore3-dev (>= 3.0),
libltdl7-dev, libfltk1.1-dev, libpng-dev, freeglut3-dev, pkg-config, quilt
Standards-Version: 3.8.0
Section: libs
Added: packages/debian/stage/debian/patches/multiline_removal
===================================================================
--- packages/debian/stage/debian/patches/multiline_removal
(rev 0)
+++ packages/debian/stage/debian/patches/multiline_removal 2011-03-29
09:42:13 UTC (rev 9041)
@@ -0,0 +1,36 @@
+--- a/libstageplugin/p_graphics.cc
++++ b/libstageplugin/p_graphics.cc
+@@ -232,8 +232,11 @@
+ PLAYER_GRAPHICS2D_CMD_POINTS, this->addr)
+ || Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
+ PLAYER_GRAPHICS2D_CMD_POLYLINE,
this->addr)
++// Draw Multiline is new in Player 3.1, this ifdef allows Stage to build
against older versions of Player
++#if defined PLAYER_GRAPHICS2D_CMD_MULTILINE
+ || Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
+ PLAYER_GRAPHICS2D_CMD_MULTILINE,
this->addr)
++#endif
+ || Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
+ PLAYER_GRAPHICS2D_CMD_POLYGON,
this->addr)) {
+ Message msg(*hdr, data);
+@@ -273,7 +276,8 @@
+ glEnd();
+ }
+ break;
+-
++// Draw Multiline is new in Player 3.1, this ifdef allows Stage to build
against older versions of Player
++#if defined PLAYER_GRAPHICS2D_CMD_MULTILINE
+ case PLAYER_GRAPHICS2D_CMD_MULTILINE: {
+ player_graphics2d_cmd_multiline_t
+ & data =
+@@ -286,10 +290,7 @@
+ }
+ break;
+
+-
+-
+-
+-
++#endif
+
+ case PLAYER_GRAPHICS2D_CMD_POLYGON: {
+ player_graphics2d_cmd_polygon_t
Added: packages/debian/stage/debian/patches/series
===================================================================
--- packages/debian/stage/debian/patches/series (rev 0)
+++ packages/debian/stage/debian/patches/series 2011-03-29 09:42:13 UTC (rev
9041)
@@ -0,0 +1 @@
+multiline_removal
Modified: packages/debian/stage/debian/rules
===================================================================
--- packages/debian/stage/debian/rules 2011-03-28 09:20:41 UTC (rev 9040)
+++ packages/debian/stage/debian/rules 2011-03-29 09:42:13 UTC (rev 9041)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# Also if libs installed to lib64 move them to lib so dhshlibs can find them
common-install-impl::
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
