diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/freetype/patches/patch-builds_unix_freetype2_in | 14 | ||||
| -rw-r--r-- | package/jamvm/Makefile | 3 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 4 | ||||
| -rw-r--r-- | package/openjdk7/patches/openadk.patch | 15 |
4 files changed, 27 insertions, 9 deletions
diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in index 9abb5afd9..c4d32d67e 100644 --- a/package/freetype/patches/patch-builds_unix_freetype2_in +++ b/package/freetype/patches/patch-builds_unix_freetype2_in @@ -1,5 +1,5 @@ ---- freetype-2.5.1.orig/builds/unix/freetype2.in 2013-11-12 13:53:44.000000000 +0100 -+++ freetype-2.5.1/builds/unix/freetype2.in 2013-12-06 16:08:11.000000000 +0100 +--- freetype-2.5.3.orig/builds/unix/freetype2.in 2014-03-02 18:00:45.527427412 +0100 ++++ freetype-2.5.3/builds/unix/freetype2.in 2014-05-14 18:39:37.626952859 +0200 @@ -1,7 +1,7 @@ prefix="%prefix%" -exec_prefix="%exec_prefix%" @@ -7,7 +7,13 @@ -includedir="%includedir%/freetype2" +exec_prefix="${prefix}" +libdir="${prefix}/lib" -+includedir="${prefix}/include/freetype2" ++includedir="${prefix}/include" Name: FreeType 2 - Description: A free, high-quality, and portable font engine. + URL: http://freetype.org +@@ -11,4 +11,4 @@ Requires: + Requires.private: %REQUIRES_PRIVATE% + Libs: -L${libdir} -lfreetype + Libs.private: %LIBS_PRIVATE% +-Cflags: -I${includedir} ++Cflags: -I${includedir} -I${includedir}/freetype2 diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 20d92138b..ff87be323 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= Java Virtual Machine (JVM) implementation PKG_SECTION:= lang @@ -26,6 +26,7 @@ $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \ + --includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \ --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 1b654300b..c8821b5f6 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -102,11 +102,11 @@ OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$ BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ OTHER_LDFLAGS='$(LDFLAGS_FOR_BUILD)' \ + ALSA_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' \ ALT_OPENWIN_HOME=$(STAGING_HOST_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" \ - ARCH=$(ARCH_FOR_BUILD) + ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" HOST_STYLE:= auto HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index 3001aff5b..601640a92 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -12,8 +12,8 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in patches/boot/demos.patch patches/boot/fphexconstants.patch \ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch --- icedtea-2.4.7.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.4.7/patches/openadk.patch 2014-05-13 16:57:07.173804037 +0200 -@@ -0,0 +1,7009 @@ ++++ icedtea-2.4.7/patches/openadk.patch 2014-05-15 15:52:54.503242117 +0200 +@@ -0,0 +1,7020 @@ +diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2014-02-20 19:51:45.000000000 +0100 ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-05-13 16:56:38.917714592 +0200 @@ -6993,6 +6993,17 @@ diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk + # If a sanity file doesn't exist, just make sure it's dir exists + $(SANITY_FILES): + -@$(prep-target) ++diff -Nur openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile ++--- openjdk-boot.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2014-04-12 01:23:06.000000000 +0200 +++++ openjdk-boot/jdk/make/javax/sound/jsoundalsa/Makefile 2014-05-15 15:49:03.886269427 +0200 ++@@ -72,6 +72,7 @@ ++ -DUSE_PORTS=TRUE \ ++ -DUSE_PLATFORM_MIDI_OUT=TRUE \ ++ -DUSE_PLATFORM_MIDI_IN=TRUE \ +++ $(ALSA_CPPFLAGS) \ ++ -I$(SHARE_SRC)/native/com/sun/media/sound ++ ++ # +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk +--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2014-04-12 01:23:06.000000000 +0200 ++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2014-05-01 20:03:03.681930476 +0200 |