fix cross-compiling gtk2 and jackrack modules for windows

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index b286dbe46b4d2d4a4d147806c97a874c9b2e1d86..acf161c27acd19ec60047325338a0b562a35d1f2 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -11,14 +11,14 @@ OBJS = factory.o
 
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
-CFLAGS += `pkg-config gtk+-2.0 --cflags`
-LDFLAGS += `pkg-config gtk+-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0`
 endif
 
 ifdef USE_PIXBUF
 OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += `pkg-config gdk-pixbuf-2.0 --cflags`
-LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0`
 endif
 
 ifdef USE_EXIF
@@ -35,8 +35,8 @@ endif
 ifdef USE_PANGO
 OBJS += producer_pango.o
 OBJS += filter_dynamictext.o
-CFLAGS += `pkg-config pangoft2 --cflags`
-LDFLAGS += `pkg-config pangoft2 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
 ifeq ($(targetos),Darwin)
 LDFLAGS += -liconv
 endif

diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index 06ca6a61dee3349b4bbd88a812179cf3075b0a81..60f8dd7845eb332ba609e3822d64628e0c676426 100755 (executable)
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -1,15 +1,31 @@
 #!/bin/sh
 
-if [ "$help" != "1" ]
+if [ "$help" = "1" ]
 then
+       cat << EOF
+GTK+ options:
 
-       pkg-config gtk+-2.0 2> /dev/null
+  --gtk2-prefix=path      - Override the gtk+-2.0 prefix for pkg-config
+
+EOF
+
+else
+       pkgconfig_prefix=
+       for i in "$@"
+       do
+               case $i in
+                       --gtk2-prefix=* )       pkgconfig_prefix="${i#--gtk2-prefix=}" ;;
+               esac
+       done
+       [ "$pkgconfig_prefix" != "" ] && pkgconfig_prefix="--define-variable=prefix=\"$pkgconfig_prefix\""
+
+       pkg-config $pkgconfig_prefix gtk+-2.0 2> /dev/null
        disable_gtk2=$?
 
-       pkg-config gdk-pixbuf-2.0 2> /dev/null
+       pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null
        disable_pixbuf=$?
 
-       pkg-config gdk-pixbuf-2.0 pangoft2 2> /dev/null
+       pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null
        disable_pango=$?
 
        if [ "$disable_gtk2" != "0" -a "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ]
@@ -33,6 +49,8 @@ then
        [ "$disable_pixbuf" = "0" ] && echo "USE_PIXBUF=1" >> config.mak
        [ "$disable_pango" = "0" ] && echo "USE_PANGO=1" >> config.mak
 
+       [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak
+
        pkg-config --exists 'libexif'
        if [ $? -eq 0 ]
        then

diff --git a/src/modules/gtk2/scale_line_22_yuv_mmx.S b/src/modules/gtk2/scale_line_22_yuv_mmx.S
index c929f52682d2202896aa316d6515a3a886e98df9..12e451ee1e580d46704a2b38d2e3b9f7daad7dfa 100644 (file)
--- a/src/modules/gtk2/scale_line_22_yuv_mmx.S
+++ b/src/modules/gtk2/scale_line_22_yuv_mmx.S
@@ -19,7 +19,6 @@
  */
        .file   "scale_line_22_yuv_mmx.S"
        .version        "01.01"
-       .section .note.GNU-stack,"",%progbits
 
 .extern printf
 
@@ -31,7 +30,9 @@ MSG: .ascii "scale_line_22_yuv_mmx: %d %d\n"
        .align 16
 
 #if !defined(__MINGW32__) && !defined(__CYGWIN__)      
-       
+
+       .section .note.GNU-stack,"",%progbits
+
 .globl pixops_scale_line_22_yuv_mmx
        .type    pixops_scale_line_22_yuv_mmx,@function
 pixops_scale_line_22_yuv_mmx:

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 5932a47852f10727f2526c9579d86e91db70d674..0d1fee44535cd695eb7d4558f032778dead7cc3b 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -27,11 +27,11 @@ ifdef GPL
 OBJS += $(GPL_OBJS)
 CFLAGS += -DGPL
 CFLAGS += `pkg-config --cflags libxml-2.0`
-CFLAGS += `pkg-config --cflags glib-2.0`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags glib-2.0`
 
 LDFLAGS += $(LIBDL)
 LDFLAGS += `pkg-config --libs libxml-2.0`
-LDFLAGS += `pkg-config --libs glib-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs glib-2.0`
 LDFLAGS += -lm
 
 YML_FILES = *.yml

diff --git a/src/modules/jackrack/configure b/src/modules/jackrack/configure
index 22f57615b27bf800ddc9fc9e957e09063c5f8f6c..fee51cb955d365192649f52aa523897e19b825b5 100755 (executable)
--- a/src/modules/jackrack/configure
+++ b/src/modules/jackrack/configure
@@ -1,7 +1,15 @@
 #!/bin/sh
 
-if [ "$help" != "1" ]
+if [ "$help" = "1" ]
 then
+       cat << EOF
+JACK Rack options:
+
+  --gtk2-prefix=path      - Override the gtk+-2.0 prefix for pkg-config
+
+EOF
+
+else
 
        pkg-config jack
        disable_jack=$?
@@ -23,6 +31,14 @@ then
                fi
                disable_ladspa=`[ -f "$ladspa_prefix/include/ladspa.h" ] && echo 0 || echo 1`
                echo GPL=1 > config.mak
+
+               for i in "$@"
+               do
+                       case $i in
+                               --gtk2-prefix=* )       pkgconfig_prefix="${i#--gtk2-prefix=}" ;;
+                       esac
+               done
+               [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=--define-variable=prefix=\"$pkgconfig_prefix\"" >> config.mak
        fi
 
        if [ "$disable_jack" = "1" -o "$disable_xml2" = "1" -o "$disable_ladspa" = "1" ]