From: Andre Noll Date: Tue, 20 Feb 2007 19:16:09 +0000 (+0100) Subject: Merge /home/maan/scm/paraslash_fml/paraslash X-Git-Tag: v0.2.16~76^2~5 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c0b370bfc250a599e88b482978c6c50206f7e4a5;hp=e427612b561782af169327d46ef4df4a398e0c38 Merge /home/maan/scm/paraslash_fml/paraslash --- diff --git a/Makefile.in b/Makefile.in index 5afade9f..e26deb82 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ install_sh = @install_sh@ build_date = $(shell date) system = $(shell uname -rs) cc_version = $(shell $(CC) --version | head -n 1) -codename = inductive resonance +codename = neural discharge DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls @@ -43,8 +43,9 @@ CPPFLAGS += -Wshadow BINARIES = para_server para_client para_gui para_audioc para_recv \ para_filter para_write @extra_binaries@ -man_binaries := para_server para_client para_gui para_audioc para_recv \ +all_man_binaries := para_server para_client para_gui para_audioc para_recv \ para_filter para_write para_fade para_sdl_gui para_audiod +man_binaries := $(filter-out para_dbadm para_slider para_krell.so, $(BINARIES)) man_pages := $(patsubst %, man/man1/%.1, $(man_binaries)) man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries)) FONTS := $(wildcard fonts/*.png) @@ -68,7 +69,7 @@ shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \ para_krell-2005-02.png shots := $(patsubst %,web/sync/%,$(shots)) web_pics := web/sync/paraslash.png web/sync/paraslash.ico -web_misc := overview.pdf versions/paraslash-git.tar.bz2 PUBLIC_KEY \ +web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \ key.anonymous para.css web_misc := $(patsubst %,web/sync/%,$(web_misc)) web_man := web/sync/man @@ -264,11 +265,12 @@ maintainer-clean: distclean install: all - mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(VARDIR) + mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(install_sh) -s -m 755 $(BINARIES) $(BINDIR) $(install_sh) -m 644 $(FONTS) $(FONTDIR) $(install_sh) -m 644 $(PICS) $(PICDIR) $(install_sh) -m 644 $(man_pages) $(MANDIR) + mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages) rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx) @@ -305,7 +307,7 @@ web/sync/%.ico: pics/web/%.ico web/sync cp $< $@ web/sync/para.css: web/para.css web/sync cp $< $@ -web/sync/versions/paraslash-git.tar.bz2: paraslash-git.tar.bz2 web/sync +web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync cp -a versions web/sync && cp $< $@ web/sync/overview.pdf: skencil/overview.pdf web/sync cp $< $@ diff --git a/NEWS b/NEWS index 0c26cd97..3a0e63a2 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,13 @@ NEWS ==== ----------------------------------------------- -0.2.15 (to be announced) "inductive resonance" ----------------------------------------------- +------------------------------------------ +0.?.? (to be announced) "neural discharge" +------------------------------------------ + +----------------------------------------- +0.2.15 (2007-02-16) "inductive resonance" +----------------------------------------- Minor improvements, more documentation and a bunch of bug fixes. diff --git a/configure.ac b/configure.ac index cb7ad163..fd01b188 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,14 @@ AC_PREREQ(2.60) AC_INIT(paraslash, [git], maan@systemlinux.org) AC_CONFIG_HEADER([config.h]) -########################################################################### generic +AC_PATH_PROG(UNAMEPATH, uname, no) +if test "$UNAMEPATH" = "no"; then + AC_MSG_ERROR(unable to determine system type) +fi +AC_MSG_CHECKING(os type) +OSTYPE="`$UNAMEPATH -s`" +AC_MSG_RESULT("$OSTYPE") + AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -278,6 +285,9 @@ AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ]) if test "$have_ogg" = "yes"; then AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support) filters="$filters oggdec" + if test "$OSTYPE" = "Darwin"; then + oggvorbis_libs="-Wl,-bind_at_load $oggvorbis_libs" + fi server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile" filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile" audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile" diff --git a/versions/paraslash-0.2.15.tar.bz2 b/versions/paraslash-0.2.15.tar.bz2 new file mode 100644 index 00000000..6c5573b6 Binary files /dev/null and b/versions/paraslash-0.2.15.tar.bz2 differ diff --git a/versions/paraslash-0.2.15.tar.bz2.asc b/versions/paraslash-0.2.15.tar.bz2.asc new file mode 100644 index 00000000..8f0aef58 --- /dev/null +++ b/versions/paraslash-0.2.15.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQBF1gNOWto1QDEAkw8RAsp6AJ9c7JbQ9SmmvofndDb9K9sGEZY3wgCfeNPq +/zg3HBG0Kz9LYlqXyOl66C8= +=CXbm +-----END PGP SIGNATURE----- diff --git a/web/index.in.html b/web/index.in.html index e4b1949f..cd61ac20 100644 --- a/web/index.in.html +++ b/web/index.in.html @@ -1,6 +1,10 @@

Events