mirror of https://git.wownero.com/dsc/mxe.git
Merge pull request #1157 from tonytheodore/gst-plugins
gstreamer updates and shared builds
This commit is contained in:
commit
98952806e7
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := cairo
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.14.2
|
||||
$(PKG)_CHECKSUM := c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
|
||||
$(PKG)_VERSION := 1.14.6
|
||||
$(PKG)_CHECKSUM := 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252
|
||||
$(PKG)_SUBDIR := cairo-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := dbus
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.10.6
|
||||
$(PKG)_CHECKSUM := b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f
|
||||
$(PKG)_VERSION := 1.11.0
|
||||
$(PKG)_CHECKSUM := 6da762d768f061da720a2acfe0b481f31ef72f88aa10243922789c6ab19d5556
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := gdk-pixbuf
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.30.8
|
||||
$(PKG)_CHECKSUM := 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be
|
||||
$(PKG)_VERSION := 2.32.3
|
||||
$(PKG)_CHECKSUM := 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031
|
||||
$(PKG)_SUBDIR := gdk-pixbuf-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := gettext
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 0.19.5.1
|
||||
$(PKG)_CHECKSUM := a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731
|
||||
$(PKG)_VERSION := 0.19.7
|
||||
$(PKG)_CHECKSUM := 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f
|
||||
$(PKG)_SUBDIR := gettext-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := gst-plugins-base
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.4.5
|
||||
$(PKG)_CHECKSUM := 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d
|
||||
$(PKG)_VERSION := 1.6.2
|
||||
$(PKG)_CHECKSUM := c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
|
||||
|
@ -17,10 +17,7 @@ define $(PKG)_BUILD
|
|||
-exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \
|
||||
-exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--disable-debug \
|
||||
--disable-examples \
|
||||
--disable-x \
|
||||
|
@ -29,5 +26,3 @@ define $(PKG)_BUILD
|
|||
--with-html-dir='$(1)/sink'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install
|
||||
endef
|
||||
|
||||
$(PKG)_BUILD_SHARED =
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
PKG := gst-plugins-good
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.4.5
|
||||
$(PKG)_CHECKSUM := 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641
|
||||
$(PKG)_VERSION := 1.6.2
|
||||
$(PKG)_CHECKSUM := 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc cairo flac glib gst-plugins-base gstreamer gtk2 \
|
||||
jpeg liboil libpng libshout libxml2 speex taglib wavpack
|
||||
$(PKG)_DEPS := gcc cairo flac glib gst-plugins-base gstreamer jpeg \
|
||||
liboil libpng libshout libxml2 speex taglib wavpack
|
||||
|
||||
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-good/refs,$(gstreamer_UPDATE))
|
||||
|
||||
|
@ -21,18 +21,18 @@ define $(PKG)_BUILD
|
|||
# http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html
|
||||
# http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--disable-debug \
|
||||
--disable-examples \
|
||||
--disable-aalib \
|
||||
$(if $(BUILD_SHARED), --disable-shout2) \
|
||||
--disable-x \
|
||||
--mandir='$(1)/sink' \
|
||||
--docdir='$(1)/sink' \
|
||||
--with-html-dir='$(1)/sink'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
|
||||
endef
|
||||
|
||||
$(PKG)_BUILD_SHARED =
|
||||
# some .dlls are installed to lib - no obvious way to change
|
||||
$(and $(BUILD_SHARED),
|
||||
mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
|
||||
endef
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 3c2f96d5bbadcff5724523612e5cf0e2d6a9ac51 Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
Date: Tue, 12 Nov 2013 02:49:49 +1100
|
||||
Subject: [PATCH] remove _chsize redefinition
|
||||
|
||||
|
||||
diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
|
||||
index 470ad5e..eb8dbe8 100644
|
||||
--- a/plugins/elements/gstfilesink.c
|
||||
+++ b/plugins/elements/gstfilesink.c
|
||||
@@ -56,8 +56,6 @@
|
||||
#define lseek _lseeki64
|
||||
#undef off_t
|
||||
#define off_t guint64
|
||||
-#undef ftruncate
|
||||
-#define ftruncate _chsize
|
||||
#ifdef _MSC_VER /* Check if we are using MSVC, fileno is deprecated in favour */
|
||||
#define fileno _fileno /* of _fileno */
|
||||
#endif
|
||||
--
|
||||
1.8.4
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := gstreamer
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.4.5
|
||||
$(PKG)_CHECKSUM := 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae
|
||||
$(PKG)_VERSION := 1.6.2
|
||||
$(PKG)_CHECKSUM := 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
|
||||
|
@ -21,10 +21,7 @@ define $(PKG)_BUILD
|
|||
$(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in
|
||||
$(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--disable-debug \
|
||||
--disable-check \
|
||||
--disable-tests \
|
||||
|
@ -33,6 +30,8 @@ define $(PKG)_BUILD
|
|||
--docdir='$(1)/sink' \
|
||||
--with-html-dir='$(1)/sink'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install
|
||||
endef
|
||||
|
||||
$(PKG)_BUILD_SHARED =
|
||||
# some .dlls are installed to lib - no obvious way to change
|
||||
$(and $(BUILD_SHARED),
|
||||
mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
|
||||
endef
|
||||
|
|
|
@ -31,7 +31,8 @@ define $(PKG)_BUILD
|
|||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-gtk-doc \
|
||||
GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \
|
||||
GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums'
|
||||
GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' \
|
||||
CFLAGS='-Wno-error=deprecated-declarations -std=c99'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
$(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
PKG := icu4c
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 54.1
|
||||
$(PKG)_VERSION := 56.1
|
||||
$(PKG)_MAJOR := $(word 1,$(subst ., ,$($(PKG)_VERSION)))
|
||||
$(PKG)_CHECKSUM := d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
|
||||
$(PKG)_CHECKSUM := 3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816
|
||||
$(PKG)_SUBDIR := icu
|
||||
$(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz
|
||||
$(PKG)_URL := http://download.icu-project.org/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
|
|
|
@ -0,0 +1,163 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Schleef <ds@schleef.org>
|
||||
Date: Tue, 20 Jul 2010 14:05:26 -0700
|
||||
Subject: [PATCH] x86: Fix cpuid function on x86-64
|
||||
|
||||
Taken from:
|
||||
http://cgit.freedesktop.org/liboil/commit/?id=705916007fba0a845229a02dc6474cb523eff150
|
||||
|
||||
diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/liboil/liboilcpu-x86.c
|
||||
+++ b/liboil/liboilcpu-x86.c
|
||||
@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
|
||||
static void
|
||||
get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
|
||||
{
|
||||
+ *a = op;
|
||||
__asm__ (
|
||||
- " pushq %%rbx\n"
|
||||
" cpuid\n"
|
||||
- " mov %%ebx, %%esi\n"
|
||||
- " popq %%rbx\n"
|
||||
- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d)
|
||||
- : "0" (op));
|
||||
+ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d));
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void)
|
||||
{
|
||||
uint32_t eax, ebx, ecx, edx;
|
||||
uint32_t level;
|
||||
- char vendor[13] = { 0 };
|
||||
+ char vendor[13+4] = { 0 };
|
||||
int ret;
|
||||
|
||||
oil_fault_check_enable ();
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sat, 9 Jan 2016 11:21:30 +1100
|
||||
Subject: [PATCH] Win64 Support
|
||||
|
||||
Taken from:
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=26651
|
||||
|
||||
diff --git a/liboil/amd64/wavelet.c b/liboil/amd64/wavelet.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/liboil/amd64/wavelet.c
|
||||
+++ b/liboil/amd64/wavelet.c
|
||||
@@ -2,7 +2,7 @@
|
||||
#include <liboil/liboilfunction.h>
|
||||
#include <liboil/liboilclasses.h>
|
||||
#include <stddef.h>
|
||||
-
|
||||
+#include <stdint.h>
|
||||
|
||||
void
|
||||
deinterleave2_asm (int16_t *d1, int16_t *d2, int16_t *s_2xn, int n)
|
||||
@@ -1409,7 +1409,7 @@ multiply_and_acc_12xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
" jnz 1b\n"
|
||||
" emms\n"
|
||||
: "+r" (i1), "+r" (s1), "+r" (s2), "+r" (n)
|
||||
- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
|
||||
+ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
|
||||
);
|
||||
}
|
||||
OIL_DEFINE_IMPL_FULL (multiply_and_acc_12xn_s16_u8_mmx,
|
||||
@@ -1596,7 +1596,7 @@ mas4_across_add_s16_mmx (int16_t *d, int16_t *s1, int16_t *s2_nx4, int sstr2,
|
||||
[s2_nx4_off] "+r" (s2_nx4_off),
|
||||
[n] "+m" (n),
|
||||
[s1] "+r" (s1)
|
||||
- : [sstr] "r" ((long)(sstr2))
|
||||
+ : [sstr] "r" ((intptr_t)(sstr2))
|
||||
);
|
||||
}
|
||||
OIL_DEFINE_IMPL_FULL (mas4_across_add_s16_mmx, mas4_across_add_s16,
|
||||
@@ -1753,8 +1753,8 @@ mas8_across_add_s16_mmx (int16_t *d, int16_t *s1, int16_t *s2_nx8, int sstr2,
|
||||
[s3_8] "+r" (s3_8),
|
||||
[d] "+r" (d),
|
||||
[n] "+m" (n),
|
||||
- [s1] "+r" ((long)(s1))
|
||||
- : [sstr] "r" ((long)(sstr2))
|
||||
+ [s1] "+r" ((intptr_t)(s1))
|
||||
+ : [sstr] "r" ((intptr_t)(sstr2))
|
||||
);
|
||||
}
|
||||
OIL_DEFINE_IMPL_FULL (mas8_across_add_s16_mmx, mas8_across_add_s16,
|
||||
diff --git a/liboil/i386_amd64/mas.c b/liboil/i386_amd64/mas.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/liboil/i386_amd64/mas.c
|
||||
+++ b/liboil/i386_amd64/mas.c
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
#include <liboil/liboilfunction.h>
|
||||
#include <liboil/liboilclasses.h>
|
||||
-
|
||||
+#include <stdint.h>
|
||||
|
||||
void
|
||||
mas10_u8_mmx (uint8_t *d, const uint8_t *s1_np9, const int16_t *s2_10,
|
||||
@@ -1106,7 +1106,7 @@ mas8_across_u8_mmx_3 (uint8_t *d, const uint8_t *s1_nx8, int ss1,
|
||||
" packuswb %%mm2, %%mm2\n"
|
||||
" movd %%mm2, 0(%[d])\n"
|
||||
: [p] "+r" (p)
|
||||
- : [d] "r" (d), [ss1] "r" ((long)ss1));
|
||||
+ : [d] "r" (d), [ss1] "r" ((intptr_t)ss1));
|
||||
d+=4;
|
||||
s1_nx8+=4;
|
||||
n--;
|
||||
diff --git a/liboil/i386_amd64/multiply_and_acc.c b/liboil/i386_amd64/multiply_and_acc.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/liboil/i386_amd64/multiply_and_acc.c
|
||||
+++ b/liboil/i386_amd64/multiply_and_acc.c
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
#include <liboil/liboilfunction.h>
|
||||
#include <liboil/liboilclasses.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
void
|
||||
multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
@@ -32,7 +33,7 @@ multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
#ifdef __i386__
|
||||
: "m" (is1), "m" (ss1), "m" (ss2)
|
||||
#else
|
||||
- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
|
||||
+ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
|
||||
#endif
|
||||
);
|
||||
}
|
||||
@@ -68,7 +69,7 @@ multiply_and_acc_8xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
#ifdef __i386__
|
||||
: "m" (is1), "m" (ss1), "m" (ss2)
|
||||
#else
|
||||
- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
|
||||
+ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
|
||||
#endif
|
||||
);
|
||||
}
|
||||
@@ -114,7 +115,7 @@ multiply_and_acc_16xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
#ifdef __i386__
|
||||
: "m" (is1), "m" (ss1), "m" (ss2)
|
||||
#else
|
||||
- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
|
||||
+ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
|
||||
#endif
|
||||
);
|
||||
}
|
||||
@@ -170,7 +171,7 @@ multiply_and_acc_24xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
|
||||
#ifdef __i386__
|
||||
: "m" (is1), "m" (ss1), "m" (ss2)
|
||||
#else
|
||||
- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
|
||||
+ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
|
||||
#endif
|
||||
);
|
||||
}
|
|
@ -16,19 +16,20 @@ define $(PKG)_UPDATE
|
|||
head -1
|
||||
endef
|
||||
|
||||
# liboil is in maintenance-only phase:
|
||||
# http://cgit.freedesktop.org/liboil/commit/?id=04b154aa118c0fdf244932dadc3d085f6290db7a
|
||||
|
||||
# configure doesn't wildcard host test for x86_64
|
||||
# `as_cv_unaligned_access` so set it manually
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--disable-debug \
|
||||
--disable-examples \
|
||||
--mandir='$(1)/sink' \
|
||||
--docdir='$(1)/sink' \
|
||||
--with-html-dir='$(1)/sink'
|
||||
--with-html-dir='$(1)/sink' \
|
||||
as_cv_unaligned_access=yes
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install
|
||||
endef
|
||||
|
||||
$(PKG)_BUILD_x86_64-w64-mingw32 =
|
||||
|
||||
$(PKG)_BUILD_SHARED =
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := libpng
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.6.19
|
||||
$(PKG)_CHECKSUM := 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8
|
||||
$(PKG)_VERSION := 1.6.20
|
||||
$(PKG)_CHECKSUM := 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b
|
||||
$(PKG)_SUBDIR := libpng-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,30 +3,42 @@ See index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From b05b2d82333e13f637dffb93f821907f775eb585 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 20 May 2012 23:23:37 +0200
|
||||
Subject: [PATCH] mingw fixes
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Baptiste Kempf <jb@videolan.org>
|
||||
Date: Mon, 30 Nov 2015 17:19:26 +0100
|
||||
Subject: [PATCH] Fix: test arpa/inet.h presence before using it
|
||||
|
||||
---
|
||||
include/shout/shout.h.in | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
Fix: test arpa/inet.h presence before using it
|
||||
|
||||
diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in
|
||||
index 682ad49..f412cdc 100644
|
||||
--- a/include/shout/shout.h.in
|
||||
+++ b/include/shout/shout.h.in
|
||||
@@ -23,8 +23,10 @@
|
||||
This fixes the Windows build.
|
||||
|
||||
Taken from:
|
||||
https://git.xiph.org/?p=icecast-libshout.git;a=commit;h=53aa028d13ac624e2c1e71796d529e773867d1d4
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1111111..2222222 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -74,7 +74,7 @@ dnl Checks for programs.
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_TIME
|
||||
-AC_CHECK_HEADERS([strings.h sys/timeb.h])
|
||||
+AC_CHECK_HEADERS([strings.h sys/timeb.h arpa/inet.h])
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef WIN32
|
||||
+#ifndef __MINGW32__
|
||||
#include <os.h>
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
diff --git a/src/proto_roaraudio.c b/src/proto_roaraudio.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/proto_roaraudio.c
|
||||
+++ b/src/proto_roaraudio.c
|
||||
@@ -28,7 +28,9 @@
|
||||
#endif
|
||||
|
||||
/* for htonl(). */
|
||||
+#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
+#endif
|
||||
|
||||
#define SHOUTERR_SUCCESS (0)
|
||||
#define SHOUTERR_INSANE (-1)
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
PKG := libshout
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.3.1
|
||||
$(PKG)_CHECKSUM := cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e
|
||||
$(PKG)_VERSION := 2.4.1
|
||||
$(PKG)_CHECKSUM := f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc ogg speex theora vorbis
|
||||
$(PKG)_DEPS := gcc ogg openssl speex theora vorbis
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- 'http://www.icecast.org/download.php' | \
|
||||
|
@ -18,10 +18,8 @@ endef
|
|||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
ac_cv_prog_PKGCONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
|
||||
--disable-thread \
|
||||
--infodir='$(1)/sink' \
|
||||
--mandir='$(1)/sink'
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := lzo
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.08
|
||||
$(PKG)_CHECKSUM := ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614
|
||||
$(PKG)_VERSION := 2.09
|
||||
$(PKG)_CHECKSUM := f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c
|
||||
$(PKG)_SUBDIR := lzo-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := lzo-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FILE)
|
||||
|
|
|
@ -21,7 +21,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)/build' && cmake .. \
|
||||
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
|
||||
-DLIBTYPE=$(if $(BUILD_SHARED),SHARED,STATIC) \
|
||||
-DEXAMPLES=FALSE \
|
||||
-DALSOFT_EXAMPLES=FALSE \
|
||||
-DALSOFT_UTILS=FALSE
|
||||
$(MAKE) -C '$(1)/build' -j '$(JOBS)' install
|
||||
|
||||
|
|
|
@ -1,58 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 31fe54c6c787bc3b66dd22a17528aeaeb0544752 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 11:13:12 +0200
|
||||
Subject: [PATCH] fix case in headers windows.h, winsock2.h
|
||||
|
||||
---
|
||||
examples/osghangglide/hat.cpp | 2 +-
|
||||
src/osg/DisplaySettings.cpp | 2 +-
|
||||
src/osgPlugins/ply/typedefs.h | 4 ++--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp
|
||||
index 4ef9e79..2884770 100644
|
||||
--- a/examples/osghangglide/hat.cpp
|
||||
+++ b/examples/osghangglide/hat.cpp
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
#ifdef _MSC_VER
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#pragma warning( disable : 4244 )
|
||||
#endif
|
||||
|
||||
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
|
||||
index 8ebae0d..8731c10 100644
|
||||
--- a/src/osg/DisplaySettings.cpp
|
||||
+++ b/src/osg/DisplaySettings.cpp
|
||||
@@ -24,7 +24,7 @@ using namespace osg;
|
||||
using namespace std;
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
-#include<Windows.h>
|
||||
+#include<windows.h>
|
||||
extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; }
|
||||
#else
|
||||
extern "C" { int NvOptimusEnablement=0x00000001; }
|
||||
diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h
|
||||
index 4d6c833..7a1e334 100644
|
||||
--- a/src/osgPlugins/ply/typedefs.h
|
||||
+++ b/src/osgPlugins/ply/typedefs.h
|
||||
@@ -13,8 +13,8 @@
|
||||
#define MESH_TYPEDEFS_H
|
||||
|
||||
# if defined(_MSC_VER)
|
||||
-# include <Winsock2.h>
|
||||
-# include <Windows.h>
|
||||
+# include <winsock2.h>
|
||||
+# include <windows.h>
|
||||
# endif
|
||||
|
||||
# include <osg/Notify>
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -0,0 +1,157 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 11:13:12 +0200
|
||||
Subject: [PATCH] fix case in headers windows.h, winsock2.h
|
||||
|
||||
|
||||
diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/examples/osghangglide/hat.cpp
|
||||
+++ b/examples/osghangglide/hat.cpp
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
#ifdef _MSC_VER
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#pragma warning( disable : 4244 )
|
||||
#endif
|
||||
|
||||
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osg/DisplaySettings.cpp
|
||||
+++ b/src/osg/DisplaySettings.cpp
|
||||
@@ -24,7 +24,7 @@ using namespace osg;
|
||||
using namespace std;
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
-#include<Windows.h>
|
||||
+#include<windows.h>
|
||||
extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; }
|
||||
#else
|
||||
extern "C" { int NvOptimusEnablement=0x00000001; }
|
||||
diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osgPlugins/ply/typedefs.h
|
||||
+++ b/src/osgPlugins/ply/typedefs.h
|
||||
@@ -13,8 +13,8 @@
|
||||
#define MESH_TYPEDEFS_H
|
||||
|
||||
# if defined(_MSC_VER)
|
||||
-# include <Winsock2.h>
|
||||
-# include <Windows.h>
|
||||
+# include <winsock2.h>
|
||||
+# include <windows.h>
|
||||
# endif
|
||||
|
||||
# include <osg/Notify>
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 12:54:07 +0200
|
||||
Subject: [PATCH] fix case in library ws2_32
|
||||
|
||||
|
||||
diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ IF(WIN32)
|
||||
mdns_win/dns_sd.h
|
||||
mdns_win/dns-sd.c
|
||||
)
|
||||
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
|
||||
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
|
||||
SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
|
||||
ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
|
||||
ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
|
||||
diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osgPlugins/osc/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/osc/CMakeLists.txt
|
||||
@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID)
|
||||
ip/win32/NetworkingUtils.cpp
|
||||
ip/win32/UdpSocket.cpp
|
||||
)
|
||||
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
|
||||
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
|
||||
ELSE()
|
||||
SET(TARGET_SRC
|
||||
${TARGET_SRC}
|
||||
diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osgPlugins/vrml/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/vrml/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ IF (WIN32)
|
||||
PNG_LIBRARY
|
||||
ZLIB_LIBRARY)
|
||||
SET(TARGET_EXTERNAL_LIBRARIES
|
||||
- Ws2_32.lib)
|
||||
+ ws2_32.lib)
|
||||
ELSE()
|
||||
SET(TARGET_LIBRARIES_VARS
|
||||
OPENVRML_LIBRARY)
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 14:00:54 +0200
|
||||
Subject: [PATCH] fix pointer to int conversion on 64bit
|
||||
|
||||
|
||||
diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
|
||||
// no image file so use this inline name image and create a file
|
||||
std::stringstream ss;
|
||||
ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator();
|
||||
- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location
|
||||
+ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location
|
||||
std::string filename = ss.str();
|
||||
if (osgDB::writeImageFile(*image, filename)) {
|
||||
image->setFileName(filename);
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
|
||||
Date: Sun, 10 Jan 2016 14:04:18 +1100
|
||||
Subject: [PATCH] openscenegraph: use previously built openthreads
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -8,7 +8,6 @@ ENDIF()
|
||||
|
||||
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
|
||||
FOREACH( mylibfolder
|
||||
- OpenThreads
|
||||
osg
|
||||
osgDB
|
||||
osgUtil
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sun, 10 Jan 2016 14:19:57 +1100
|
||||
Subject: [PATCH] use pkg-config for gstreamer detection in mingw
|
||||
|
||||
|
||||
diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMakeModules/FindGStreamer.cmake
|
||||
+++ b/CMakeModules/FindGStreamer.cmake
|
||||
@@ -65,7 +65,7 @@
|
||||
# )
|
||||
#endmacro()
|
||||
|
||||
-if (WIN32)
|
||||
+if (WIN32 AND NOT MINGW)
|
||||
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
|
||||
find_path(${_component_prefix}_INCLUDE_DIRS
|
||||
NAMES ${_header}
|
|
@ -1,56 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From c78dde633089cdff3142eb30cc01c5bd77a3c617 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 12:54:07 +0200
|
||||
Subject: [PATCH] fix case in library ws2_32
|
||||
|
||||
---
|
||||
src/osgPlugins/ZeroConfDevice/CMakeLists.txt | 2 +-
|
||||
src/osgPlugins/osc/CMakeLists.txt | 2 +-
|
||||
src/osgPlugins/vrml/CMakeLists.txt | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
index 5287cfc..fab449e 100644
|
||||
--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ IF(WIN32)
|
||||
mdns_win/dns_sd.h
|
||||
mdns_win/dns-sd.c
|
||||
)
|
||||
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
|
||||
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
|
||||
SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
|
||||
ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
|
||||
ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
|
||||
diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt
|
||||
index 6bf6127..0529e17 100644
|
||||
--- a/src/osgPlugins/osc/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/osc/CMakeLists.txt
|
||||
@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID)
|
||||
ip/win32/NetworkingUtils.cpp
|
||||
ip/win32/UdpSocket.cpp
|
||||
)
|
||||
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
|
||||
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
|
||||
ELSE()
|
||||
SET(TARGET_SRC
|
||||
${TARGET_SRC}
|
||||
diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
|
||||
index 867e0df..5e5eb26 100644
|
||||
--- a/src/osgPlugins/vrml/CMakeLists.txt
|
||||
+++ b/src/osgPlugins/vrml/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ IF (WIN32)
|
||||
PNG_LIBRARY
|
||||
ZLIB_LIBRARY)
|
||||
SET(TARGET_EXTERNAL_LIBRARIES
|
||||
- Ws2_32.lib)
|
||||
+ ws2_32.lib)
|
||||
ELSE()
|
||||
SET(TARGET_LIBRARIES_VARS
|
||||
OPENVRML_LIBRARY)
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 9858a76d8daebe3e26f67eb530c89a8f00d5cd28 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Nagaev <bnagaev@gmail.com>
|
||||
Date: Fri, 9 Oct 2015 14:00:54 +0200
|
||||
Subject: [PATCH] fix pointer to int conversion on 64bit
|
||||
|
||||
---
|
||||
src/osgPlugins/osgjs/WriteVisitor.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
index 9f2b3c7..98e0c19 100644
|
||||
--- a/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp
|
||||
@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
|
||||
// no image file so use this inline name image and create a file
|
||||
std::stringstream ss;
|
||||
ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator();
|
||||
- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location
|
||||
+ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location
|
||||
std::string filename = ss.str();
|
||||
if (osgDB::writeImageFile(*image, filename)) {
|
||||
image->setFileName(filename);
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
diff -burN OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt OpenSceneGraph-3.4.0/src/CMakeLists.txt
|
||||
--- OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt 2015-12-03 11:53:17.597970954 +0100
|
||||
+++ OpenSceneGraph-3.4.0/src/CMakeLists.txt 2015-12-03 11:55:07.941146106 +0100
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
|
||||
FOREACH( mylibfolder
|
||||
- OpenThreads
|
||||
osg
|
||||
osgDB
|
||||
osgUtil
|
|
@ -8,7 +8,9 @@ $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e30
|
|||
$(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip
|
||||
$(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr openthreads poppler qt tiff xine-lib zlib
|
||||
$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gstreamer \
|
||||
gta jasper jpeg libpng openal openexr openthreads poppler \
|
||||
qt tiff xine-lib zlib
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- 'http://trac.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
diff -burN OpenSceneGraph-3.4.0.orig/CMakeLists.txt OpenSceneGraph-3.4.0/CMakeLists.txt
|
||||
--- OpenSceneGraph-3.4.0.orig/CMakeLists.txt 2015-08-12 08:38:59.000000000 +0200
|
||||
+++ OpenSceneGraph-3.4.0/CMakeLists.txt 2015-12-02 16:42:16.565976939 +0100
|
||||
@@ -1046,16 +1046,7 @@
|
||||
|
||||
|
||||
# OSG Core
|
||||
-ADD_SUBDIRECTORY(src)
|
||||
-
|
||||
-IF (BUILD_OSG_APPLICATIONS AND NOT ANDROID)
|
||||
- ADD_SUBDIRECTORY(applications)
|
||||
-ENDIF()
|
||||
-
|
||||
-IF (BUILD_OSG_EXAMPLES)
|
||||
- ADD_SUBDIRECTORY(examples)
|
||||
-ENDIF()
|
||||
-
|
||||
+ADD_SUBDIRECTORY(src/OpenThreads)
|
||||
|
||||
IF(APPLE AND NOT ANDROID)
|
||||
|
||||
@@ -1251,24 +1242,7 @@
|
||||
|
||||
# Generate pkg-config configuration files
|
||||
|
||||
-SET(PKGCONFIG_FILES
|
||||
- openscenegraph
|
||||
- openscenegraph-osg
|
||||
- openscenegraph-osgDB
|
||||
- openscenegraph-osgFX
|
||||
- openscenegraph-osgGA
|
||||
- openscenegraph-osgParticle
|
||||
- openscenegraph-osgSim
|
||||
- openscenegraph-osgText
|
||||
- openscenegraph-osgUtil
|
||||
- openscenegraph-osgTerrain
|
||||
- openscenegraph-osgManipulator
|
||||
- openscenegraph-osgViewer
|
||||
- openscenegraph-osgWidget
|
||||
- openscenegraph-osgShadow
|
||||
- openscenegraph-osgAnimation
|
||||
- openscenegraph-osgVolume
|
||||
-)
|
||||
+SET(PKGCONFIG_FILES)
|
||||
|
||||
IF(QT4_FOUND OR Qt5Widgets_FOUND )
|
||||
SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgQt)
|
|
@ -0,0 +1,72 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
|
||||
Date: Mon, 11 Jan 2016 15:33:57 +1100
|
||||
Subject: [PATCH] build standalone openthreads
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -649,7 +649,7 @@ OPTION(OSG_USE_LOCAL_LUA_SOURCE "Enable to use local Lua source when building th
|
||||
#
|
||||
IF(ANDROID)
|
||||
ANDROID_3RD_PARTY()
|
||||
-ELSE()
|
||||
+ELSEIF(NOT OPENTHREADS_STANDALONE)
|
||||
# Common to all platforms except android:
|
||||
FIND_PACKAGE(Freetype)
|
||||
FIND_PACKAGE(Inventor)
|
||||
@@ -787,7 +787,7 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
|
||||
|
||||
# Image readers/writers depend on 3rd party libraries except for OS X which
|
||||
# can use Quicktime.
|
||||
-IF(NOT ANDROID)
|
||||
+IF(NOT ANDROID AND NOT OPENTHREADS_STANDALONE)
|
||||
IF(NOT APPLE)
|
||||
FIND_PACKAGE(GIFLIB)
|
||||
FIND_PACKAGE(JPEG)
|
||||
@@ -1044,7 +1044,9 @@ ELSE ()
|
||||
SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
|
||||
ENDIF()
|
||||
|
||||
-
|
||||
+IF(OPENTHREADS_STANDALONE)
|
||||
+ADD_SUBDIRECTORY(src/OpenThreads)
|
||||
+ELSE()
|
||||
# OSG Core
|
||||
ADD_SUBDIRECTORY(src)
|
||||
|
||||
@@ -1055,7 +1057,7 @@ ENDIF()
|
||||
IF (BUILD_OSG_EXAMPLES)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
ENDIF()
|
||||
-
|
||||
+ENDIF()
|
||||
|
||||
IF(APPLE AND NOT ANDROID)
|
||||
|
||||
@@ -1250,7 +1252,9 @@ IF(CMAKE_CPACK_COMMAND)
|
||||
ENDIF()
|
||||
|
||||
# Generate pkg-config configuration files
|
||||
-
|
||||
+IF(OPENTHREADS_STANDALONE)
|
||||
+SET(PKGCONFIG_FILES)
|
||||
+ELSE()
|
||||
SET(PKGCONFIG_FILES
|
||||
openscenegraph
|
||||
openscenegraph-osg
|
||||
@@ -1269,6 +1273,7 @@ SET(PKGCONFIG_FILES
|
||||
openscenegraph-osgAnimation
|
||||
openscenegraph-osgVolume
|
||||
)
|
||||
+ENDIF()
|
||||
|
||||
IF(QT4_FOUND OR Qt5Widgets_FOUND )
|
||||
SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgQt)
|
|
@ -17,9 +17,10 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
mkdir '$(1).build'
|
||||
cd '$(1).build' && '$(TARGET)-cmake' \
|
||||
-DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
|
||||
-DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
|
||||
-DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \
|
||||
-DOPENTHREADS_STANDALONE=TRUE \
|
||||
-DOSG_USE_QT=FALSE \
|
||||
-D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
|
||||
-D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
|
||||
'$(1)'
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := pixman
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 0.31.2
|
||||
$(PKG)_CHECKSUM := 7e2dbef309f359276b98bbaf20e3fbef2c26edf4bce414138d0a51be7becc1ae
|
||||
$(PKG)_VERSION := 0.33.6
|
||||
$(PKG)_CHECKSUM := 4e1e72c0ed31d10944f304976e87e6c87b441c853713eeecf115e22c23d4b17d
|
||||
$(PKG)_SUBDIR := pixman-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE)
|
||||
|
|
Loading…
Reference in New Issue