Mercurial > mxe-octave

changeset 2478:ce0389409fd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #31 from yujinrobot/master Minor updates to the apr/log4cxx packages
author Tony Theodore <tonyt@logyst.com>
date Wed, 02 May 2012 10:16:43 -0700
parents 54363e195f8b (diff) 597e7ee22138 (current diff)
children dd56cda1d06d
files
diffstat 7 files changed, 123 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 02 22:32:45 2012 +0900
+++ b/Makefile	Wed May 02 10:16:43 2012 -0700
@@ -101,7 +101,7 @@
 	@echo '[check requirements]'
 	$(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT)))
 	$(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[4-9]\|2\.[7-9][0-9])
-	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\.[0-9]\+)
+	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\(\.[0-9]\+\)\?)
 	@[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
 	@touch '$@'
 
--- a/index.html	Wed May 02 22:32:45 2012 +0900
+++ b/index.html	Wed May 02 10:16:43 2012 -0700
@@ -1339,6 +1339,16 @@
         <td id="libgcrypt-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</a></td>
     </tr>
     <tr>
+        <td id="libgda-package">libgda</td>
+        <td id="libgda-version">4.2.13</td>
+        <td id="libgda-website"><a href="http://www.gnome-db.org/">libgda</a></td>
+    </tr>
+    <tr>
+        <td id="libgdamm-package">libgdamm</td>
+        <td id="libgdamm-version">4.1.3</td>
+        <td id="libgdamm-website"><a href="https://launchpad.net/libgdamm">libgdamm</a></td>
+    </tr>
+    <tr>
         <td id="libgee-package">libgee</td>
         <td id="libgee-version">0.5.0</td>
         <td id="libgee-website"><a href="http://live.gnome.org/Libgee">libgee</a></td>
@@ -1554,6 +1564,11 @@
         <td id="matio-website"><a href="http://sourceforge.net/projects/matio/">matio</a></td>
     </tr>
     <tr>
+        <td id="mdbtools-package">mdbtools</td>
+        <td id="mdbtools-version">0.6pre1</td>
+        <td id="mdbtools-website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td>
+    </tr>
+    <tr>
         <td id="mingw-utils-package">mingw-utils</td>
         <td id="mingw-utils-version">0.4-1</td>
         <td id="mingw-utils-website"><a href="http://www.mingw.org/">MinGW Utilities</a></td>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgda.mk	Wed May 02 10:16:43 2012 -0700
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# LibGDA
+PKG             := libgda
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 61d0b498202b780750633cc2e957c40325d6c705
+$(PKG)_SUBDIR   := libgda-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgda-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgda/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2 mdbtools postgresql
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgda need to be fixed.' >&2;
+    echo $(libgda_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-gtk-doc \
+        --without-bdb \
+        --with-mdb \
+        --without-oracle \
+        --without-mysql \
+        --without-firebird \
+        --without-java \
+        --enable-binreloc \
+        --disable-crypto
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgdamm.mk	Wed May 02 10:16:43 2012 -0700
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# libgdamm
+PKG             := libgdamm
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := f6126d7b46720e3ea4f3d49e03add2e52da233be
+$(PKG)_SUBDIR   := libgdamm-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgdamm-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgdamm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libgda glibmm
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgdamm need to be fixed.' >&2;
+    echo $(libgdamm_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        CXX='$(TARGET)-c++' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools-1-header.patch	Wed May 02 10:16:43 2012 -0700
@@ -0,0 +1,15 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur mdbtools-0.6pre1-orig//include/mdbtools.h mdbtools-0.6pre1//include/mdbtools.h
+--- mdbtools-0.6pre1-orig//include/mdbtools.h	2011-06-01 00:07:12.336088034 +0900
++++ mdbtools-0.6pre1//include/mdbtools.h	2011-06-01 00:10:51.536088143 +0900
+@@ -147,7 +147,7 @@
+ #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+
+ /* hash to store registered backends */
+-extern GHashTable	*mdb_backends;
++static GHashTable	*mdb_backends;
+
+ /* forward declarations */
+ typedef struct mdbindex MdbIndex;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools.mk	Wed May 02 10:16:43 2012 -0700
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# mdbtools
+PKG             := mdbtools
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
+endef
--- a/src/sdl_mixer.mk	Wed May 02 22:32:45 2012 +0900
+++ b/src/sdl_mixer.mk	Wed May 02 10:16:43 2012 -0700
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := SDL_mixer-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_mixer-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc sdl libmikmod ogg vorbis smpeg
+$(PKG)_DEPS     := gcc sdl libmodplug ogg vorbis smpeg
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \
@@ -19,7 +19,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in'
     echo \
         'Libs.private:' \
-        "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \
+        "`$(TARGET)-pkg-config libmodplug --libs`" \
         "`$(PREFIX)/$(TARGET)/bin/smpeg-config     --libs`" \
         >> '$(1)/SDL_mixer.pc.in'
     $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
@@ -29,7 +29,8 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
-        --enable-music-mod \
+        --disable-music-mod \
+        --enable-music-mod-modplug \
         --enable-music-ogg \
         --disable-music-flac \
         --enable-music-mp3 \
@@ -39,7 +40,6 @@
         --disable-music-mp3-shared \
         --disable-smpegtest \
         --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \
-        LIBMIKMOD_CONFIG='$(PREFIX)/$(TARGET)/bin/libmikmod-config' \
         LIBS='-lvorbis -logg'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=