From 30315c91f618900bd5bb3f8066cb805163890315 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 28 Mar 2013 00:31:00 +0100 Subject: [PATCH 1/6] make install --- src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile b/src/Makefile index 03a0134..29815d3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -51,3 +51,7 @@ vmtest: vm_test.c vm_slow.c ibniz2c: ibniz2c.c compiler.c gen_c.c gcc -DIBNIZ2C -Os compiler.c ibniz2c.c -o ibniz2c -lm + +install: ${EXE} + install -d ${DESTDIR}/usr/bin + install $< ${DESTDIR}/usr/bin/ From 292afbaebe799741b1551b52c462aaa054946415 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 1 May 2014 22:02:31 +0200 Subject: [PATCH 2/6] packaging: Intial packaging for debian project Signed-off-by: Philippe Coval --- debian/changelog | 5 ++ debian/compat | 1 + debian/control | 19 +++++ debian/copyright | 34 ++++++++ debian/docs | 2 + debian/examples | 1 + debian/install | 1 + debian/manpages | 1 + debian/menu | 7 ++ debian/patches/fixingmakefile.patch | 37 +++++++++ debian/patches/manpage.patch | 123 ++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/rules | 13 +++ debian/source/format | 1 + debian/upstream | 6 ++ debian/watch | 4 + 16 files changed, 257 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/examples create mode 100644 debian/install create mode 100644 debian/manpages create mode 100644 debian/menu create mode 100644 debian/patches/fixingmakefile.patch create mode 100644 debian/patches/manpage.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/upstream create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5ac6619 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +ibniz (1.18-1) unstable; urgency=low + + * Initial release (Closes: #724249) + + -- maxigas Mon, 23 Sep 2013 00:12:09 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..62f1eb0 --- /dev/null +++ b/debian/control @@ -0,0 +1,19 @@ +Source: ibniz +Section: graphics +Priority: optional +Maintainer: maxigas +Build-Depends: debhelper (>= 9), libsdl1.2-dev, python-docutils, perl +Standards-Version: 3.9.4 +Homepage: http://pelulamu.net/ibniz/ +#Vcs-Git: git://git.debian.org/collab-maint/ibniz.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/ibniz.git;a=summary + +Package: ibniz +Architecture: alpha any-amd64 arm armel armhf arm64 any-i386 ia64 mipsel sh4 x32 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Virtual machine for compact low-level audiovisual programs + IBNIZ is a virtual machine designed for extremely compact low-level + audiovisual programs. The leading design goal is usefulness as a + platform for demoscene productions, glitch art and similar projects. + Mainsteam software engineering aspects are considered totally + irrelevant. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5a21876 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ibniz +Source: + +Files: * +Copyright: 2012 Ville-Matias Heikkila +License: zlib + +Files: debian/* +Copyright: 2013 maxigas +License: zlib + +License: zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute + it freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. + + + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..5c33ed1 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +ibniz.txt + diff --git a/debian/examples b/debian/examples new file mode 100644 index 0000000..4cd66f8 --- /dev/null +++ b/debian/examples @@ -0,0 +1 @@ +examples/* \ No newline at end of file diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..60bca38 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +ibniz usr/bin \ No newline at end of file diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..0f49e86 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +ibniz.1 diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..fed9409 --- /dev/null +++ b/debian/menu @@ -0,0 +1,7 @@ +?package(ibniz): \ +needs="X11" \ +section="Applications/Video" \ +title="IBNIZ" \ +command="ibniz" \ +hints="Audio,Video,VJ,Live programming" + diff --git a/debian/patches/fixingmakefile.patch b/debian/patches/fixingmakefile.patch new file mode 100644 index 0000000..9df9984 --- /dev/null +++ b/debian/patches/fixingmakefile.patch @@ -0,0 +1,37 @@ +Description: Added hardening flags and fixed a compiler reference. + Hardening flags according to https://wiki.debian.org/Hardening +Author: maxigas +Forwarded: no +Last-Update: <2013-09-23> + +Index: ibniz-1.18/Makefile +=================================================================== +--- ibniz-1.18.orig/Makefile 2013-09-23 01:30:34.000000000 +0200 ++++ ibniz-1.18/Makefile 2013-09-23 01:38:34.000000000 +0200 +@@ -26,16 +26,16 @@ + # cat ui_sdl.c vm_slow.c clipboard.c > whole.c + + $(EXE): ui_sdl.o vm_slow.o clipboard.o +- $(CC) -Os -s ui_sdl.o vm_slow.o clipboard.o -o $(EXE) $(FLAGS) -lm ++ $(CC) -Os -s ui_sdl.o vm_slow.o clipboard.o -o $(EXE) $(FLAGS) $(LDFLAGS) -lm + + ui_sdl.o: ui_sdl.c ibniz.h font.i vm.h texts.i vm.h +- $(CC) -c -Os ui_sdl.c -o ui_sdl.o $(FLAGS) ++ $(CC) -c -Os ui_sdl.c -o ui_sdl.o $(FLAGS) $(CFLAGS) $(CPPFLAGS) + + clipboard.o: clipboard.c ibniz.h +- $(CC) -c -Os clipboard.c -o clipboard.o $(FLAGS) ++ $(CC) -c -Os clipboard.c -o clipboard.o $(FLAGS) $(CFLAGS) $(CPPFLAGS) + + vm_slow.o: vm_slow.c ibniz.h vm.h +- $(CC) -c -O3 vm_slow.c -o vm_slow.o ++ $(CC) -c -O3 vm_slow.c -o vm_slow.o $(CFLAGS) $(CPPFLAGS) + + font.i: font.pl + perl font.pl > font.i +@@ -44,4 +44,4 @@ + ./vmtest + + vmtest: vm_test.c vm_slow.c +- gcc vm_test.c vm_slow.c -o vmtest -lm ++ $(CC) vm_test.c vm_slow.c -o vmtest -lm $(CFLAGS) $(CPPFLAGS) diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch new file mode 100644 index 0000000..a093b52 --- /dev/null +++ b/debian/patches/manpage.patch @@ -0,0 +1,123 @@ +Added a man page which is compiled from rst.Index: ibniz-1.18/Makefile +=================================================================== +--- ibniz-1.18.orig/Makefile 2013-09-23 02:20:56.000000000 +0200 ++++ ibniz-1.18/Makefile 2013-09-23 02:20:56.000000000 +0200 +@@ -2,7 +2,7 @@ + CC=gcc + EXE=ibniz + FLAGS=`sdl-config --libs --cflags` -DX11 -lX11 +-all: ibniz ++all: ibniz ibniz.1 + + # For win32 builds using mingw32 (you'll probably need to modify these) + #CC=i586-mingw32msvc-gcc +@@ -11,7 +11,7 @@ + #all: ibniz.exe + + clean: +- rm -f *.o *~ ibniz vmtest ibniz.exe whole.c ++ rm -f *.o *~ ibniz vmtest ibniz.exe whole.c ibniz.1 + + package: clean + cd .. && cp -R src ibniz-1.18 && tar czf ibniz-1.18.tar.gz ibniz-1.18 +@@ -45,3 +45,7 @@ + + vmtest: vm_test.c vm_slow.c + $(CC) vm_test.c vm_slow.c -o vmtest -lm $(CFLAGS) $(CPPFLAGS) ++ ++ibniz.1: ibniz.rst ++ rst2man ibniz.rst ibniz.1 ++ +Index: ibniz-1.18/ibniz.rst +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ibniz-1.18/ibniz.rst 2013-09-23 02:23:38.000000000 +0200 +@@ -0,0 +1,88 @@ ++========= ++ ibniz ++========= ++ ++---------------------------------------------------------- ++Virtual machine for compact low-level audiovisual programs ++---------------------------------------------------------- ++ ++:Author: Originally written by Ville-Matias Heikkila , Man page by maxigas , based on the original ibniz.txt. ++:Date: 2013-09-23 ++:Copyright: zlib ++:Version: 1.18 ++:Manual section: 1 ++:Manual group: real time audio-video synthesis ++ ++SYNOPSIS ++======== ++ ++ ibniz [OPTION]... [CODE] ++ ++DESCRIPTION ++=========== ++ ++Virtual machine for compact low-level audiovisual programs ++ ++IBNIZ is a virtual machine designed for extremely compact low-level ++audiovisual programs. The leading design goal is usefulness as a ++platform for demoscene productions, glitch art and similar projects. ++Mainsteam software engineering aspects are considered totally ++irrelevant. ++ ++IBNIZ stands for Ideally Bare Numeric Impression giZmo. The name also ++refers to Gottfried Leibniz, the 17th-century polymath who, among all, ++invented binary arithmetic, built the first four-operation calculating ++machine, and believed that the world was designed with the principle ++that a minimal set of rules should yield a maximal diversity. ++ ++The IBNIZ virtual machine is basically a two-stack machine somewhat ++similar to Forth implementations but with the major difference that ++the stack is cyclical and also used as output buffer. The machine runs ++in an endless loop by default, with the loop counter variable(s) ++pushed on top of the stack on every loop cycle. ++ ++Each instruction is one character long, with the exception of ++'loadimm' which consists of a string of hexadecimal digits. This also ++gives IBNIZ some flavor of an esoteric programming language. ++ ++OPTIONS ++======= ++ ++--config= Read configuration settings from , if it exists. ++--version, -V Show this program's version number and exit. ++--help, -h Show this help message and exit. ++ ++And a lot more standard docutils options. ++ ++COMMAND LINE OPTIONS ++==================== ++ ++-h Dump help on command line usage ++-v Dump version info ++-c CODE Execute code ++-n No autorun of loaded code ++ ++The following extra options were added for creating the YouTube ++video: ++ ++-e Dump user keystrokes to stdout ++-p Playback dumped user keystrokes from stdin ++-M Dump raw video to stdout and raw audio to stderr, 30 fps, non-realtime, yuv4mpeg2 and pcm_s16 ++ ++EXAMPLES ++======== ++ ++Some commands used in this process, for reference: ++ ++``./ibniz -e > events`` ++ ++``./ibniz -M -p < events 2>vid.pcm | ffmpeg -y -i - -r 30 vid.avi`` ++ ++``ffmpeg -i vid.avi -f s16le -ar 44100 -ac 1 -i vid.pcm -vcodec copy vidav.avi`` ++ ++SEE ALSO ++======== ++ ++* `ibniz.txt ` ++ ++ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ccfcb18 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +fixingmakefile.patch +manpage.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3ba6fd5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +%: + dh $@ --parallel + +override_dh_auto_build: + rm -f font.i + dh_auto_build + +override_dh_auto_test: + make runtest + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/upstream b/debian/upstream new file mode 100644 index 0000000..994be80 --- /dev/null +++ b/debian/upstream @@ -0,0 +1,6 @@ +Name: IBNIZ (Ideally Bare Numeric Impression giZmo) +Homepage: http://pelulamu.net/ibniz/ +Screenshots: https://www.youtube.com/embed/aKMrBaXJvMs +Repository: https://github.com/viznut/IBNIZ/ +Repository-Browse: https://github.com/viznut/IBNIZ/ + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..21545c2 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 +http://pelulamu.net/ibniz/ ibniz-(\d\.\d+)\.tar\.gz + + From a6ca1cd1b7dae301cebd6b592cb11fbb70e21500 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 1 May 2014 22:03:40 +0200 Subject: [PATCH 3/6] wip Signed-off-by: Philippe Coval --- debian/changelog | 18 ++++++++++++++++++ debian/control | 11 +++++++++++ debian/patches/series | 4 ++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ac6619..696e46c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +ibniz (0.0.20140501-0ubuntu0~rzr0) saucy; urgency=medium + + * wip: http://rzr.online.fr/q/snapshot#ibniz + + -- Philippe Coval Thu, 01 May 2014 22:02:32 +0200 + +ibniz (0.0.20140501-0ubuntu0~rzr0) saucy; urgency=medium + + * WIP: http://rzr.online.fr/q/snapshot#ibniz + + -- Philippe Coval Thu, 01 May 2014 22:02:31 +0200 + +ibniz (0.0.0-0) UNRELEASED; urgency=medium + + * TODO: remove on release + + -- Philippe Coval Thu, 01 May 2014 22:02:31 +0200 + ibniz (1.18-1) unstable; urgency=low * Initial release (Closes: #724249) diff --git a/debian/control b/debian/control index 62f1eb0..210d597 100644 --- a/debian/control +++ b/debian/control @@ -17,3 +17,14 @@ Description: Virtual machine for compact low-level audiovisual programs platform for demoscene productions, glitch art and similar projects. Mainsteam software engineering aspects are considered totally irrelevant. + +Package: ibniz-snapshot +Architecture: all +Section: sound +Depends: ibniz (= ${source:Version}), ${misc:Depends} +Suggests: rzr +Priority: extra +Description: unreleased snapshot version + TODO: Remove on issue and upgrade ibniz + http://rzr.online.fr/q/snapshot#ibniz Feedback welcome + diff --git a/debian/patches/series b/debian/patches/series index ccfcb18..ac08cd2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -fixingmakefile.patch -manpage.patch +#fixingmakefile.patch +#manpage.patch From 9d1c357eed240103d95780c0c822004af171e451 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 1 May 2014 22:21:38 +0200 Subject: [PATCH 4/6] wip Signed-off-by: Philippe Coval --- .gitignore | 6 ++++++ debian/control | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1435b98 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*~ +debian/*.log +debian/*.subvars +debian/*/*/* +debian/files +packaging/*/* diff --git a/debian/control b/debian/control index 210d597..62f1eb0 100644 --- a/debian/control +++ b/debian/control @@ -17,14 +17,3 @@ Description: Virtual machine for compact low-level audiovisual programs platform for demoscene productions, glitch art and similar projects. Mainsteam software engineering aspects are considered totally irrelevant. - -Package: ibniz-snapshot -Architecture: all -Section: sound -Depends: ibniz (= ${source:Version}), ${misc:Depends} -Suggests: rzr -Priority: extra -Description: unreleased snapshot version - TODO: Remove on issue and upgrade ibniz - http://rzr.online.fr/q/snapshot#ibniz Feedback welcome - From 24dd08694b4034bca2ce6fb9e112aae954ed3df8 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 1 May 2014 22:27:36 +0200 Subject: [PATCH 5/6] wip Signed-off-by: Philippe Coval --- debian/rules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 3ba6fd5..5ebde36 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,13 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -%: - dh $@ --parallel +%: src + cd $< && dh $@ --parallel -override_dh_auto_build: - rm -f font.i - dh_auto_build +override_dh_auto_build: src + cd $< && rm -f font.i + cd $< && dh_auto_build -override_dh_auto_test: - make runtest +override_dh_auto_test: src + make runtest -C $< From 98465641e0d11e37311740b398b3b686e536ef4e Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 1 May 2014 22:32:05 +0200 Subject: [PATCH 6/6] wip Signed-off-by: Philippe Coval --- debian/rules | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 5ebde36..aa1d1ca 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,17 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +export DH_VERBOSE=1 -%: src - cd $< && dh $@ --parallel +%: + dh $@ --parallel -override_dh_auto_build: src - cd $< && rm -f font.i - cd $< && dh_auto_build +override_dh_configure: src + mv $