[Pkg-erlang-commits] r1380 - in libsdl-erlang/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Dec 21 12:18:29 UTC 2011 

Author: sgolovan
Date: 2011-12-21 12:18:28 +0000 (Wed, 21 Dec 2011)
New Revision: 1380

Added:
   libsdl-erlang/trunk/debian/patches/gl.patch
Removed:
   libsdl-erlang/trunk/debian/erlang-esdl-dev.dirs
Modified:
   libsdl-erlang/trunk/debian/README.Debian
   libsdl-erlang/trunk/debian/changelog
   libsdl-erlang/trunk/debian/control
   libsdl-erlang/trunk/debian/erlang-esdl-dev.install
   libsdl-erlang/trunk/debian/erlang-esdl-doc.install
   libsdl-erlang/trunk/debian/erlang-esdl.dirs
   libsdl-erlang/trunk/debian/erlang-esdl.install
   libsdl-erlang/trunk/debian/patches/driver.patch
   libsdl-erlang/trunk/debian/patches/series
   libsdl-erlang/trunk/debian/rules
Log:
[esdl]
  * New upstream release.
  * Moved the installed files back to /usr/lib/erlang/lib tree because their
    conflicts with main Erlang distribution are resolved.
  * Do not include gl.hrl in sdl_img.erl and sdl_ttf.erl as it is not necessary
    and breaks their build.


Modified: libsdl-erlang/trunk/debian/README.Debian
===================================================================
--- libsdl-erlang/trunk/debian/README.Debian	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/README.Debian	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,16 +1,16 @@
 ESDL Debian README
 
 ESDL is a library which provides Erlang bindings to Simple Direct Media
-Library. Since version 0.96.0626-12 it installs into /usr/lib/esdl directory
-to weaken conflicts with wxErlang (both libraries include modules gl and glu
-which aren't compatible). This means that to use ESDL user has to run Erlang
-emulator with option -pa /usr/lib/esdl/ebin. For example, in
+Library. Since version 1.2-1 it installs into /usr/lib/erlang/lib directory
+tree which allows one to use ESDL without any additional command line
+options. For example, in
 /usr/share/doc/erlang-esdl-doc/examples directory (provided that
 erlang-esdl-doc package is installed) you may run:
 
-erl -smp disable -pa /usr/lib/esdl/ebin -s erldemo go
+erl -smp enable -s erldemo go
 
-and get a simple nice ESDL demo. Note that ESDL doesn't work in SMP-enabled
-Erlang VM, so it's safer to add -smp disable option also.
+and get a simple nice ESDL demo. Note that since version 1.2 ESDL uses
+wxErlang which doesn't work without SMP, so it's better to add -smp enable
+option.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 17 May 2009 15:32:54 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 21 Dec 2011 15:18:16 +0400

Modified: libsdl-erlang/trunk/debian/changelog
===================================================================
--- libsdl-erlang/trunk/debian/changelog	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/changelog	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,8 +1,12 @@
-esdl (1.0.1-5) UNRELEASED; urgency=low
+esdl (1.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Moved the installed files back to /usr/lib/erlang/lib tree because their
+    conflicts with main Erlang distribution are resolved.
+  * Do not include gl.hrl in sdl_img.erl and sdl_ttf.erl as it is not necessary
+    and breaks their build.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Dec 2011 12:49:09 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 21 Dec 2011 16:17:06 +0400
 
 esdl (1.0.1-4) experimental; urgency=low
 

Modified: libsdl-erlang/trunk/debian/control
===================================================================
--- libsdl-erlang/trunk/debian/control	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/control	2011-12-21 12:18:28 UTC (rev 1380)
@@ -14,7 +14,7 @@
 
 Package: erlang-esdl
 Architecture: any
-Depends: ${erlang-base:Depends}, ${erlang-abi:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang:Depends}, ${erlang-abi:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libsdl-erlang
 Replaces: libsdl-erlang
 Provides: libsdl-erlang

Deleted: libsdl-erlang/trunk/debian/erlang-esdl-dev.dirs
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl-dev.dirs	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/erlang-esdl-dev.dirs	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1 +0,0 @@
-/usr/lib/esdl

Modified: libsdl-erlang/trunk/debian/erlang-esdl-dev.install
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl-dev.install	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/erlang-esdl-dev.install	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/esdl/include
-debian/tmp/usr/lib/esdl/src/*.hrl
+debian/tmp/usr/lib/erlang/lib/esdl-*/include
+debian/tmp/usr/lib/erlang/lib/esdl-*/src/*.hrl

Modified: libsdl-erlang/trunk/debian/erlang-esdl-doc.install
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl-doc.install	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/erlang-esdl-doc.install	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1 +1 @@
-debian/tmp/usr/lib/esdl/doc/*	usr/share/doc/erlang-esdl-doc/html
+debian/tmp/usr/lib/erlang/lib/esdl-*/doc/*	usr/share/doc/erlang-esdl-doc/html

Modified: libsdl-erlang/trunk/debian/erlang-esdl.dirs
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl.dirs	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/erlang-esdl.dirs	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,2 +1 @@
-/usr/lib/esdl
 /usr/share/lintian/overrides

Modified: libsdl-erlang/trunk/debian/erlang-esdl.install
===================================================================
--- libsdl-erlang/trunk/debian/erlang-esdl.install	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/erlang-esdl.install	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/esdl/ebin
-debian/tmp/usr/lib/esdl/priv
+debian/tmp/usr/lib/erlang/lib/esdl-*/ebin
+debian/tmp/usr/lib/erlang/lib/esdl-*/priv

Modified: libsdl-erlang/trunk/debian/patches/driver.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/driver.patch	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/patches/driver.patch	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1,8 +1,8 @@
 Patch fixes esdl_driver loading into Erlang R15B.
 
---- esdl-1.0.1.orig/c_src/esdl_driver.c
-+++ esdl-1.0.1/c_src/esdl_driver.c
-@@ -32,13 +32,18 @@
+--- esdl-1.2.orig/c_src/esdl_driver.c
++++ esdl-1.2/c_src/esdl_driver.c
+@@ -32,15 +32,20 @@
  
  #include "esdl.h"
  
@@ -18,12 +18,16 @@
  static void sdl_driver_finish(void);
 -static int sdl_driver_control(ErlDrvData handle, unsigned int command, 
 -			      char* buf, int count, char** res, int res_size);
+-static int sdl_driver_debug_control(ErlDrvData handle, unsigned int command, 
+-				    char* buf, int count, char** res, int res_size);
 +static ErlDrvSSizeT sdl_driver_control(ErlDrvData handle, unsigned int command, 
-+				       char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
++			      char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
++static ErlDrvSSizeT sdl_driver_debug_control(ErlDrvData handle, unsigned int command, 
++				    char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
+ 
  static void standard_outputv(ErlDrvData drv_data, ErlIOVec *ev);
  
- /*
-@@ -59,6 +64,17 @@
+@@ -62,6 +67,17 @@
      sdl_driver_control,    /* F_PTR control, port_control callback */
      NULL,                  /* F_PTR timeout, reserved */
      standard_outputv,	   /* F_PTR outputv, reserved */
@@ -41,7 +45,7 @@
  };
  
  DRIVER_INIT(sdl_driver)
-@@ -148,9 +164,9 @@
+@@ -176,9 +192,9 @@
  {
  }
  
@@ -53,12 +57,18 @@
  {
    sdl_data* sd = (sdl_data *) handle;
    sdl_fun func;
-@@ -159,14 +175,14 @@
-   sd->len = 0;
-   sd->op = op;
-   func = sd->fun_tab[op];
--  func(sd, count, buf);
-+  func(sd, (int)count, buf);
+@@ -190,7 +206,7 @@
+   if(op < OPENGL_START) {
+      // fprintf(stderr, "Command:%d:%s: ", op, sd->str_tab[op]);fflush(stderr);
+      func = sd->fun_tab[op];
+-     func(sd, count, buf);
++     func(sd, (int)count, buf);
+   } else {
+       // fprintf(stderr, "Command:%d:gl_??\r\n", op); fflush(stderr);
+      gl_dispatch(sd, op, count, buf);
+@@ -198,12 +214,12 @@
+   }
+   // fprintf(stderr, "%s:%d: Eed %d\r\n", __FILE__,__LINE__,op); fflush(stderr);
    (*res) = sd->buff;
 -  return sd->len;
 +  return (ErlDrvSSizeT)(sd->len);
@@ -72,22 +82,22 @@
  {
    sdl_data* sd = (sdl_data *) handle;
    sdl_fun func;
-@@ -178,15 +194,15 @@
-   fprintf(stderr, "Command:%d:%s: ", op, sd->str_tab[op]);
-   func = sd->fun_tab[op];
- 
--  func(sd, count, buf);
-+  func(sd, (int)count, buf);
-   if ((len = sd->len) >= 0) {
-     fprintf(stderr, "ok\r\n");
-     (*res) = sd->buff;
--    return len;
-+    return (ErlDrvSSizeT)len;
+@@ -215,15 +231,15 @@
+   if(op < OPENGL_START) {
+      fprintf(stderr, "Command:%d:%s: ", op, sd->str_tab[op]);fflush(stderr);
+      func = sd->fun_tab[op];
+-     func(sd, count, buf);
++     func(sd, (int)count, buf);
+      if ((len = sd->len) >= 0) {
+ 	fprintf(stderr, "ok %d %p\r\n", len, sd->buff);fflush(stderr);
+ 	(*res) = sd->buff;
+-	return len;
++	return (ErlDrvSSizeT)len;
+      } else {
+ 	fprintf(stderr, "error\r\n");fflush(stderr);
+ 	*res = 0;
+-	return -1;
++	return (ErlDrvSSizeT)(-1);
+      }     
    } else {
-     fprintf(stderr, "error\r\n");
-     *res = 0;
--    return -1;
-+    return (ErlDrvSSizeT)(-1);
-   }
- }
- 
+       fprintf(stderr, "Command:%d ", op);fflush(stderr);

Added: libsdl-erlang/trunk/debian/patches/gl.patch
===================================================================
--- libsdl-erlang/trunk/debian/patches/gl.patch	                        (rev 0)
+++ libsdl-erlang/trunk/debian/patches/gl.patch	2011-12-21 12:18:28 UTC (rev 1380)
@@ -0,0 +1,23 @@
+Patch removes unused includes of gl.hrl which in turn was moved to the
+wxErlang.
+
+--- esdl-1.2.orig/src/sdl_img.erl
++++ esdl-1.2/src/sdl_img.erl
+@@ -16,7 +16,6 @@
+ -module(sdl_img).
+ 
+ -include("sdl_img_funcs.hrl").
+--include("gl.hrl").
+ -include("sdl_util.hrl").
+ -include("sdl_video.hrl").
+ 
+--- esdl-1.2.orig/src/sdl_ttf.erl
++++ esdl-1.2/src/sdl_ttf.erl
+@@ -16,7 +16,6 @@
+ 
+ -include("sdl_ttf.hrl").
+ -include("sdl_ttf_funcs.hrl").
+--include("gl.hrl").
+ -include("sdl_util.hrl").
+ -include("sdl_video.hrl").
+ 

Modified: libsdl-erlang/trunk/debian/patches/series
===================================================================
--- libsdl-erlang/trunk/debian/patches/series	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/patches/series	2011-12-21 12:18:28 UTC (rev 1380)
@@ -1 +1,2 @@
 driver.patch
+gl.patch

Modified: libsdl-erlang/trunk/debian/rules
===================================================================
--- libsdl-erlang/trunk/debian/rules	2011-12-17 10:25:45 UTC (rev 1379)
+++ libsdl-erlang/trunk/debian/rules	2011-12-21 12:18:28 UTC (rev 1380)
@@ -8,8 +8,9 @@
 
 export QUILT_PATCHES := debian/patches
 
--include vsn
+-include vsn.mk
 TOPDIR := $(CURDIR)/debian/tmp
+PACKAGEDIR := /usr/lib/erlang/lib/$(ESDL_VSN)
 
 patch: patch-stamp
 patch-stamp:
@@ -24,7 +25,7 @@
 	rm -f patch-stamp
 
 build: build-indep build-arch
-build-indep:
+build-indep: config-stamp build-stamp
 build-arch: config-stamp build-stamp
 build-stamp:
 	dh_testdir
@@ -58,20 +59,20 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	mkdir -m 755 -p $(TOPDIR)/usr/lib/esdl
+	mkdir -m 755 -p $(TOPDIR)$(PACKAGEDIR)
 	#
 	# Add here commands to install the package into debian/tmp.
 	$(MAKE) install ENABLE_SDL_TTF=yes ENABLE_SDL_IMAGE=yes \
-			INSTALLDIR=$(TOPDIR)/usr/lib/esdl
+			INSTALLDIR=$(TOPDIR)$(PACKAGEDIR)
 	#
-	rm -f $(TOPDIR)/usr/lib/esdl/Readme*
-	rm -f $(TOPDIR)/usr/lib/esdl/license.terms
-	rm -f $(TOPDIR)/usr/lib/esdl/vsn
+	rm -f $(TOPDIR)$(PACKAGEDIR)/Readme*
+	rm -f $(TOPDIR)$(PACKAGEDIR)/license.terms
+	rm -f $(TOPDIR)$(PACKAGEDIR)/vsn
 	#
-	chmod a-x $(TOPDIR)/usr/lib/esdl/doc/*
-	chmod a-x $(TOPDIR)/usr/lib/esdl/src/*
-	chmod a-x $(TOPDIR)/usr/lib/esdl/c_src/*
-	chmod a-x $(TOPDIR)/usr/lib/esdl/include/*
+	chmod a-x $(TOPDIR)$(PACKAGEDIR)/doc/*
+	chmod a-x $(TOPDIR)$(PACKAGEDIR)/src/*
+	chmod a-x $(TOPDIR)$(PACKAGEDIR)/c_src/*
+	chmod a-x $(TOPDIR)$(PACKAGEDIR)/include/*
 	#
 	touch install-stamp
 
@@ -84,11 +85,6 @@
 	dh_installdocs -i
 	dh_installexamples -i
 	chmod a-x $(CURDIR)/debian/erlang-esdl-doc/usr/share/doc/erlang-esdl-doc/examples/*
-#	dh_installmenu -i
-#	dh_installemacsen -i
-#	dh_installinit -i
-#	dh_installcron -i
-#	dh_installmanpages -i
 	dh_installchangelogs -i
 	dh_strip -i
 	dh_compress -i -X.erl -X.beam -X.wav -X.bmp
@@ -109,11 +105,6 @@
 	dh_install -a
 	dh_installdocs -a
 	dh_installexamples -a
-#	dh_installmenu -a
-#	dh_installemacsen -a
-#	dh_installinit -a
-#	dh_installcron -a
-#	dh_installmanpages -a
 	dh_installchangelogs -a
 	install debian/erlang-esdl.lintian-overrides \
 		$(CURDIR)/debian/erlang-esdl/usr/share/lintian/overrides/erlang-esdl

More information about the Pkg-erlang-commits mailing list