commit 21d70eb6f28471cc3ed1ea031229f40b49edd349
parent aa007cbe8b76d4726ce37b03e407bcdd5639bb54
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Wed, 20 Apr 2011 21:13:20 +0800
osx: @VERSION@ usage in spek.modules
Diffstat:
5 files changed, 60 insertions(+), 58 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,32 @@
-!src/spek-audio.c
-!src/spek-fft.c
-!src/spek-platform.c
-*.bz2
-*.msi
*~
-.DS_Store
-.deps
-.svn
-Makefile
-Makefile.in
-Makefile.in.in
aclocal.m4
autom4te.cache
+*.bz2
compile
config.*
configure
data/spek.desktop
data/spek.desktop.in
depcomp
+.deps
dist/osx/Spek.app
dist/osx/Spek.dmg
-dist/osx/bin
+dist/osx/spek.modules
dist/win/spek.wxs
+.DS_Store
install-sh
intltool-extract.in
intltool-merge.in
intltool-update.in
libtool
ltmain.sh
+Makefile
+Makefile.in
+Makefile.in.in
man/spek.1
missing
mkinstalldirs
+*.msi
omf.make
po/*.gmo
po/.intltool-merge-cache
@@ -39,9 +35,13 @@ po/stamp-it
samples/
src/*.c
src/*.o
-src/*.stamp
src/spek
+!src/spek-audio.c
+!src/spek-fft.c
+!src/spek-platform.c
+src/*.stamp
stamp-h1
+.svn
test*
web/version
xmldocs.make
diff --git a/Makefile.am b/Makefile.am
@@ -19,6 +19,7 @@ EXTRA_DIST = \
dist/osx/gtkrc \
dist/osx/launcher.sh \
dist/osx/spek.bundle \
+ dist/osx/spek.modules \
dist/win/LICENSE.rtf \
dist/win/banner.bmp \
dist/win/bundle.sh \
diff --git a/configure.ac b/configure.ac
@@ -55,6 +55,7 @@ AC_CONFIG_FILES([
data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/icons/scalable/Makefile
+ dist/osx/spek.modules
dist/win/spek.wxs
man/Makefile
man/spek.1
diff --git a/dist/osx/spek.modules b/dist/osx/spek.modules
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
- <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
-
- <repository type="tarball" name="spek" default="yes" href="http://spek.googlecode.com/files/"/>
- <repository type="tarball" name="libav" href="http://libav.org/releases/"/>
- <repository type="tarball" name="cairographics-dev" href="http://cairographics.org/snapshots/"/>
- <repository type="git" name="github.com" href="git://github.com/"/>
-
- <autotools id="cairo" autogen-sh="configure" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
- <branch module="cairo-1.11.2.tar.gz" version="1.11.2" repo="cairographics-dev"/>
- <dependencies>
- <dep package="pixman"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="fontconfig"/>
- <dep package="freetype"/>
- </after>
- </autotools>
-
- <autotools id="gtk-quartz-engine">
- <branch module="jralls/gtk-quartz-engine" repo="github.com"/>
- <after>
- <dep package="meta-gtk-osx-core"/>
- </after>
- </autotools>
-
- <autotools id="libav" autogenargs="--disable-static --enable-shared --enable-gpl --enable-version3 --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-swscale --enable-pthreads --disable-encoders --disable-muxers --disable-devices --disable-filters" autogen-sh="configure" autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
- <branch module="libav-0.6.2.tar.bz2" version="0.6.2" repo="libav" hash="sha1:b79dc56a08f4ef07b41d1a78b2251f21fde8b81d"/>
- </autotools>
-
- <autotools id="spek" autogen-sh="configure">
- <branch module="spek-0.6.tar.bz2" version="0.6" repo="spek"/>
- <dependencies>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-core"/>
- <dep package="cairo"/>
- <dep package="gtk-quartz-engine"/>
- <dep package="libav"/>
- </dependencies>
- </autotools>
-</moduleset>
diff --git a/dist/osx/spek.modules.in b/dist/osx/spek.modules.in
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <include href="http://github.com/jralls/gtk-osx-build/raw/master/modulesets-stable/gtk-osx.modules"/>
+
+ <repository type="tarball" name="spek" default="yes" href="http://spek.googlecode.com/files/"/>
+ <repository type="tarball" name="libav" href="http://libav.org/releases/"/>
+ <repository type="tarball" name="cairographics-dev" href="http://cairographics.org/snapshots/"/>
+ <repository type="git" name="github.com" href="git://github.com/"/>
+
+ <autotools id="cairo" autogen-sh="configure" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
+ <branch module="cairo-1.11.2.tar.gz" version="1.11.2" repo="cairographics-dev"/>
+ <dependencies>
+ <dep package="pixman"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="fontconfig"/>
+ <dep package="freetype"/>
+ </after>
+ </autotools>
+
+ <autotools id="gtk-quartz-engine">
+ <branch module="jralls/gtk-quartz-engine" repo="github.com"/>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ </after>
+ </autotools>
+
+ <autotools id="libav" autogenargs="--disable-static --enable-shared --enable-gpl --enable-version3 --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-swscale --enable-pthreads --disable-encoders --disable-muxers --disable-devices --disable-filters" autogen-sh="configure" autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --libdir=%(libdir)s %(autogenargs)s">
+ <branch module="libav-0.6.2.tar.bz2" version="0.6.2" repo="libav" hash="sha1:b79dc56a08f4ef07b41d1a78b2251f21fde8b81d"/>
+ </autotools>
+
+ <autotools id="spek" autogen-sh="configure">
+ <branch module="spek-@VERSION@.tar.bz2" version="@VERSION@" repo="spek"/>
+ <dependencies>
+ <dep package="meta-gtk-osx-bootstrap"/>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="cairo"/>
+ <dep package="gtk-quartz-engine"/>
+ <dep package="libav"/>
+ </dependencies>
+ </autotools>
+</moduleset>
