[Pkg-erlang-commits] r1381 - in wings3d/trunk/debian: . bin patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2011-12-21 12:41:14 +0000 (Wed, 21 Dec 2011)
New Revision: 1381

Added:
   wings3d/trunk/debian/patches/wx.diff
Modified:
   wings3d/trunk/debian/bin/wings3d
   wings3d/trunk/debian/changelog
   wings3d/trunk/debian/control
   wings3d/trunk/debian/patches/series
   wings3d/trunk/debian/rules
Log:
[wings3d]
  * Switched to erlang-wx to manage GL output. This makes wings3d compatible
    with the newer erlang-esdl (>= 1.2) package.


Modified: wings3d/trunk/debian/bin/wings3d
===================================================================
--- wings3d/trunk/debian/bin/wings3d	2011-12-21 12:18:28 UTC (rev 1380)
+++ wings3d/trunk/debian/bin/wings3d	2011-12-21 12:41:14 UTC (rev 1381)
@@ -4,5 +4,5 @@
     . /etc/wings3d.rc
 fi
 
-exec /usr/bin/erl -noinput -smp disable -pa /usr/lib/esdl/ebin -s wings_start start_halt "$@"
+exec /usr/bin/erl -noinput -smp enable -s wings_start start_halt "$@"
 

Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog	2011-12-21 12:18:28 UTC (rev 1380)
+++ wings3d/trunk/debian/changelog	2011-12-21 12:41:14 UTC (rev 1381)
@@ -1,8 +1,9 @@
-wings3d (1.4.1-3) UNRELEASED; urgency=low
+wings3d (1.4.1-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Switched to erlang-wx to manage GL output. This makes wings3d compatible
+    with the newer erlang-esdl (>= 1.2) package.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Dec 2011 14:25:44 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 21 Dec 2011 16:19:57 +0400
 
 wings3d (1.4.1-2) experimental; urgency=low
 

Modified: wings3d/trunk/debian/control
===================================================================
--- wings3d/trunk/debian/control	2011-12-21 12:18:28 UTC (rev 1380)
+++ wings3d/trunk/debian/control	2011-12-21 12:41:14 UTC (rev 1381)
@@ -5,14 +5,15 @@
 Priority: optional
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.2.5), quilt (>= 0.46-7), grep-dctrl,
- erlang-dev (>= 1:14.b), erlang-esdl-dev,
+ erlang-dev (>= 1:15.b), erlang-esdl-dev (>= 1.2),
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libjpeg-dev
 Homepage: http://www.wings3d.com
 
 
 Package: wings3d
 Architecture: any
-Depends: ${erlang-base:Depends}, ${erlang-abi:Depends}, ${erlang-esdl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base:Depends}, ${erlang-abi:Depends}, ${erlang-wx:Depends},
+ ${erlang-xmerl:Depends}, ${erlang-esdl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: ${erlang-dialyzer:Depends}, ${erlang-tools:Depends}, yafray | aqsis
 Description: Nendo-inspired 3D polygon mesh modeller
  Wings 3D is a polygon mesh modeller written entirely in Erlang.  The

Modified: wings3d/trunk/debian/patches/series
===================================================================
--- wings3d/trunk/debian/patches/series	2011-12-21 12:18:28 UTC (rev 1380)
+++ wings3d/trunk/debian/patches/series	2011-12-21 12:41:14 UTC (rev 1381)
@@ -4,3 +4,4 @@
 jpeg.diff
 lang.diff
 drivers.diff
+wx.diff

Added: wings3d/trunk/debian/patches/wx.diff
===================================================================
--- wings3d/trunk/debian/patches/wx.diff	                        (rev 0)
+++ wings3d/trunk/debian/patches/wx.diff	2011-12-21 12:41:14 UTC (rev 1381)
@@ -0,0 +1,38 @@
+Patch declares wx target as a phony one. Also, it switches to wxErlang
+gl header.
+
+--- wings3d-1.4.1.orig/Makefile
++++ wings3d-1.4.1/Makefile
+@@ -8,7 +8,7 @@
+ #  See the file "license.terms" for information on usage and redistribution
+ #  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+-.PHONY: all debug clean lang
++.PHONY: all wx debug clean lang
+ 
+ all:
+ 	(cd intl_tools; $(MAKE))
+--- wings3d-1.4.1.orig/plugins_src/primitives/wpc_image.erl
++++ wings3d-1.4.1/plugins_src/primitives/wpc_image.erl
+@@ -14,7 +14,7 @@
+ -module(wpc_image).
+ -export([init/0,menu/2,command/2]).
+ 
+--include_lib("esdl/include/gl.hrl").
++-include_lib("wx/include/gl.hrl").
+ -include("e3d.hrl").
+ -include("e3d_image.hrl").
+ -include("wings_intl.hrl").
+--- wings3d-1.4.1.orig/src/wings.hrl
++++ wings3d-1.4.1/src/wings.hrl
+@@ -25,6 +25,10 @@
+ -define(SHIFT_BITS, ?KMOD_SHIFT).
+ -define(META_BITS, ?KMOD_META).
+ -endif.
++
++-ifndef(USE_WX).
++-define(USE_WX, 1).
++-endif.
+ 
+ -ifndef(USE_WX).
+ -ifdef(NEED_OPENGL).

Modified: wings3d/trunk/debian/rules
===================================================================
--- wings3d/trunk/debian/rules	2011-12-21 12:18:28 UTC (rev 1380)
+++ wings3d/trunk/debian/rules	2011-12-21 12:41:14 UTC (rev 1381)
@@ -22,7 +22,7 @@
 	dh_clean vsn.mk erl_crash.dump '*.beam' '*.so'
 
 override_dh_auto_build:
-	dh_auto_build
+	make wx
 	make lang
 
 override_dh_install: