The following commit has been merged in the master branch: commit 14ba622f591bdf8c5fa9f3a4b3808e57d8873639 Author: Romain Beauxis <to...@rastageeks.org> Date: Wed Oct 12 01:21:03 2011 +0200
* Added gd plugin package * Added default font diff --git a/debian/changelog b/debian/changelog index 5fa09a1..927b877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ liquidsoap (1.0.0-1) unstable; urgency=low * Added new gstreamer plugins. * Removed debian/README.Debian-source: problematic files have been removed upstream. + * Using ttf-liberation for default font for video.add_text + operators. -- Romain Beauxis <to...@rastageeks.org> Sun, 09 Oct 2011 16:38:00 +0200 diff --git a/debian/control b/debian/control index cedfabd..285acba 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,9 @@ Build-Depends: liblo-ocaml-dev, libcamlimages-ocaml-dev, libyojson-ocaml-dev, - libgstreamer-ocaml-dev + libgstreamer-ocaml-dev, + libgd-gd2-noxpm-ocaml-dev (>= 1.0~alpha5-3), + ttf-liberation Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git @@ -117,8 +119,9 @@ Depends: liquidsoap-plugin-faad, liquidsoap-plugin-flac, liquidsoap-plugin-gavl, - liquidsoap-plugin-gstreamer, + liquidsoap-plugin-gd, liquidsoap-plugin-graphics, + liquidsoap-plugin-gstreamer, liquidsoap-plugin-icecast, liquidsoap-plugin-jack, liquidsoap-plugin-ladspa, @@ -273,6 +276,26 @@ Description: audio streaming language -- Gavl plugin . This package provides support for gavl video manipulation in Liquidsoap. +Package: liquidsoap-plugin-gd +Architecture: any +Depends: + ${shlibs:Depends}, + ${ocaml:Depends}, + ${misc:Depends}, + ttf-liberation, + liquidsoap (= ${binary:Version}) +Description: audio streaming language -- libgd plugin + Liquidsoap is a powerful tool for building complex audio streaming systems, + typically targeting internet radios (e.g. icecast streams). + . + It consists of a simple script language, in which you can create, combine and + transform audio sources. Its design makes liquidsoap flexible and easily + extensible. + . + This package provides support for operators using libgd. Currently, + the only operator provided is input.video.add_text.gd. This operators + provides video text rendering without any X-related dependency. + Package: liquidsoap-plugin-graphics Architecture: any Depends: @@ -543,6 +566,7 @@ Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}, + ttf-liberation, liquidsoap (= ${binary:Version}) Description: audio streaming language -- SDL plugin Liquidsoap is a powerful tool for building complex audio streaming systems, diff --git a/debian/liquidsoap-plugin-gd.install b/debian/liquidsoap-plugin-gd.install new file mode 100644 index 0000000..dc7452c --- /dev/null +++ b/debian/liquidsoap-plugin-gd.install @@ -0,0 +1 @@ +usr/lib/liquidsoap/*/plugins/gd.cm* diff --git a/debian/rules b/debian/rules index 2a65598..aee4d89 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/ocaml.mk +DEFAULT_FONT := /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf + DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-ogg-dynamic-plugin --enable-schroedinger-dynamic-plugin --enable-flac-dynamic-plugin \ --enable-speex-dynamic-plugin --enable-vorbis-dynamic-plugin --enable-theora-dynamic-plugin \ @@ -15,7 +17,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-ladspa-dynamic-plugin --enable-oss-dynamic-plugin --enable-alsa-dynamic-plugin \ --enable-flac.ogg-dynamic-plugin --enable-samplerate-dynamic-plugin --enable-lame-dynamic-plugin \ --enable-dssi-dynamic-plugin --enable-lo-dynamic-plugin --enable-camlimages-dynamic-plugin \ - --enable-gstreamer-dynamic-plugin --disable-custom + --enable-gstreamer-dynamic-plugin --enable-gd-dynamic-plugin --with-default-font=$(DEFAULT_FONT) \ + --disable-custom DEB_MAKE_BUILD_TARGET := all doc DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/ OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \ prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc \ @@ -39,7 +42,7 @@ else -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora -Nliquidsoap-plugin-voaacenc \ -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist -Nliquidsoap-plugin-lame \ -Nliquidsoap-plugin-dssi -Nliquidsoap-plugin-lo -Nliquidsoap-plugin-camlimages \ - -Nliquidsoap-plugin-gstreamer + -Nliquidsoap-plugin-gstreamer -Nliquidsoap-plugin-gd export OCAMLINIT_SED := -e '/^NODYN: /d' endif -- liquidsoap packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits