[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.3-1-1-gc6a4dcc

Tue Sep 28 19:42:22 UTC 2010

The following commit has been merged in the master branch:
commit c6a4dcc53dfb80e920be036842990dcf954d3322
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Sep 28 14:44:28 2010 -0500

    Enabled non-custom build for bytecode compilation.

diff --git a/debian/changelog b/debian/changelog
index 764f3e2..27139d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+liquidsoap (0.9.3-2) experimental; urgency=low
+
+  * Added patch to enable build in non-custom mode. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 28 Sep 2010 13:46:47 -0500
+
 liquidsoap (0.9.3-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 81ff23e..012fcfa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.
 Build-Depends: cdbs (>= 0.4.53),
  debhelper (>= 7.0.1),
  ocaml-nox,
- dh-ocaml (>= 0.9), 
+ dh-ocaml (>= 0.9),
+ quilt,
+ patchutils (>= 0.2.25),
   ocaml-findlib, libcry-ocaml-dev (>= 0.1.5), 
   libogg-ocaml-dev (>= 0.4.1), libvorbis-ocaml-dev (>= 0.5.1-2), 
   libmad-ocaml-dev (>= 0.4.0), libdtools-ocaml-dev (>= 0.2.1), libtaglib-ocaml-dev (>= 0.1.3),
diff --git a/debian/patches/enable_no_custom.patch b/debian/patches/enable_no_custom.patch
new file mode 100644
index 0000000..be13bf3
--- /dev/null
+++ b/debian/patches/enable_no_custom.patch
@@ -0,0 +1,111 @@
+Index: liquidsoap/src/Makefile
+===================================================================
+--- liquidsoap.orig/src/Makefile	2010-09-28 14:25:57.000000000 -0500
++++ liquidsoap/src/Makefile	2010-09-28 14:26:58.000000000 -0500
+@@ -8,6 +8,13 @@
+ 
+ ocaml_progs= liquidsoap
+ 
++liquidsoap_c_files = \
++	stream/rgb_c.c stream/float_pcm_c.c \
++	$(if $(W_OSS),io/oss_io_c.c) \
++	$(if $(W_V4L),io/v4l_io_c.c) \
++	$(if $(NEED_TCP_NODELAY), tools/socket_stubs.c) \
++	$(if $(W_OPAL),io/opal_io_c.c)
++
+ ogg_utils = \
+ 	$(if $(W_OGG),ogg_demuxer.ml) \
+ 	$(if $(W_OGG),ogg_encoder.ml) \
+@@ -114,27 +121,25 @@
+ 	$(if $(W_SDL),outputs/sdl_out.ml) \
+ 	$(if $(W_GRAPHICS),outputs/graphics_out.ml)
+ 
+-io = $(if $(W_OSS),io/oss_io_c.c io/oss_io.ml) \
++io = $(if $(W_OSS),io/oss_io.ml) \
+ 	$(if $(W_ALSA),io/alsa_io.ml) \
+ 	$(if $(W_PORTAUDIO),io/portaudio_io.ml) \
+ 	$(if $(W_PULSEAUDIO),io/pulseaudio_io.ml) \
+ 	$(if $(W_JACK),io/jack_io.ml) \
+-	$(if $(W_V4L),io/v4l_io_c.c) \
+ 	$(if $(W_V4L),io/v4l_io.ml) \
+-	$(if $(W_OPAL),io/opal_io_c.o io/opal_io.ml) \
++	$(if $(W_OPAL),io/opal_io.ml) \
+ 	io/marshal_io.ml
+ 
+ tools = tools/doc.ml tools/plug.ml tools/utils.ml \
+ 	tools/rqueue.ml tools/ringbuffer.ml \
+-	$(if $(NEED_TCP_NODELAY), tools/socket_stubs.c) \
+ 	tools/liq_sockets.ml \
+ 	tools/wav.ml $(if $(BYTE),tools/dynliq.ml) configure.ml \
+ 	tools/tutils.ml tools/sutils.ml tools/http.ml
+ 
+-stream = stream/midi.ml fmt.ml stream/rgb_c.c stream/RGB.ml \
++stream = stream/midi.ml fmt.ml stream/RGB.ml \
+ 	stream/frame.ml decoder.ml playlist_parser.ml \
+ 	request.ml source.ml root.ml \
+-	stream/float_pcm_c.c stream/float_pcm.ml \
++	stream/float_pcm.ml \
+ 	stream/aFrame.ml stream/vFrame.ml stream/mFrame.ml
+ 
+ visualization = visualization/vumeter.ml \
+@@ -191,15 +196,6 @@
+ top_srcdir=..
+ include $(top_srcdir)/Makefile.rules
+ 
+-stream/float_pcm_c.o: stream/float_pcm_c.c
+-	$(MAKE) -C stream float_pcm_c.o
+-stream/rgb_c.o: stream/rgb_c.c
+-	$(MAKE) -C stream rgb_c.o
+-io/oss_io_c.o: io/oss_io_c.c
+-	$(MAKE) -C io oss_io_c.o
+-io/opal_io_c.o: io/opal_io_c.c
+-	$(MAKE) -C io opal_io_c.o
+-
+ # Compute something like " (trunk/liquidsoap at rev1234)" when .svn is present,
+ SVN.ml: Makefile $(liquidsoap_sources:SVN.ml=)
+ 	if test -d .svn && which svn > /dev/null ; then \
+Index: liquidsoap/Makefile.rules
+===================================================================
+--- liquidsoap.orig/Makefile.rules	2010-09-28 14:25:57.000000000 -0500
++++ liquidsoap/Makefile.rules	2010-09-28 14:27:16.000000000 -0500
+@@ -78,12 +78,27 @@
+ 	$(V)$(OCAMLDEP) $(_DEP_OPTS) $(DEP_OPTS) \
+ 		$($(PROG)_sources) $($(PROG)_headers) > $@
+ 
+-$(PROG): $($(PROG)_sources:.ml=.$(o))
++dll$(PROG).so: $($(PROG)_c_files:.c=.o)
++	$(V)echo OCAMLMKLIB -o dll$(PROG).so
++	$(V)ocamlmklib -o $(PROG) $($(PROG)_c_files:.c=.o)
++
++ifdef $(PROG)_c_files
++  ifeq ($(BYTE),yes)
++    c_objs=dll$(PROG).so $($(PROG)_c_files:.c=.o)
++    c_link=-dllib dll$(PROG).so $($(PROG)_c_files:.c=.o)
++  else
++    c_objs=$($(PROG)_c_files:.c=.o)
++    c_link=$(c_objs)
++  endif
++endif
++
++$(PROG): $($(PROG)_sources:.ml=.$(o)) $(c_objs)
+ 	$(V)echo OCAMLC -o $(PROG)
+ 	$(V)$(OCAMLC) -o $(PROG) \
+ 		$(_OCAML_CFLAGS) $(OCAML_CFLAGS) \
+ 		$(_OCAML_LFLAGS) $(OCAML_LFLAGS) \
+-		$($(PROG)_sources:.ml=.$(o)) $($(PROG)_objs)
++		$($(PROG)_sources:.ml=.$(o)) \
++		$(c_link)
+ endif
+ 
+ %.ml: %.mll
+@@ -102,6 +117,10 @@
+ 	$(V)echo OCAMLC -c $<
+ 	$(V)$(OCAMLC) $(_OCAML_CFLAGS) $(OCAML_CFLAGS) -c $<
+ 
++%.o: %.c
++	$(V)echo CC -c $<
++	$(V)$(CC) $(CFLAGS) -c $< -o $@
++
+ #
+ # dist
+ #
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5aa4cb1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+enable_no_custom.patch
diff --git a/debian/rules b/debian/rules
index ef73146..f522cc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # In order to regenerate 'debian/control' :
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
@@ -29,6 +29,9 @@ binary-install/liquidsoap::
 	mv $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
 	chmod +x $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
 	chmod -x $(CURDIR)/debian/liquidsoap/usr/share/doc/liquidsoap/examples/*.liq
+	[ ! -f $(CURDIR)/src/dllliquidsoap.so ] || \
+	  mkdir -p $(CURDIR)/debian/liquidsoap$(OCAML_DLL_DIR); \
+	  cp $(CURDIR)/src/dllliquidsoap.so $(CURDIR)/debian/liquidsoap$(OCAML_DLL_DIR)
 
 binary-install/liguidsoap::
 	sed -e s#/usr/lib/python.*/site-packages/liquidsoap#/var/lib/liguidsoap#g -i $(CURDIR)/debian/liguidsoap/usr/bin/liguidsoap
@@ -41,5 +44,6 @@ cleanbuilddir/liquidsoap::
 clean::
 	rm -rf src/liquidsoap src/META radio.liq.example \
 	       src/SVN.ml src/io/liquidsoap_depend autodoc \
-	       doc/manual debian/liquidsoap.init
+	       doc/manual debian/liquidsoap.init src/dllliquidsoap.so \
+	       src/libliquidsoap.a
 	[ ! -f src/configure.ml.cdbs-backup ] || mv -f src/configure.ml.cdbs-backup src/configure.ml

-- 
liquidsoap packaging

