(contrib) Building zvbi for windows with dynamic pthreadsGC2 dll

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index bbcbba7854a36871cb1cc042fa82472d8e80aec7..c7f474dad301b49b73fde7f36566b78c63553635 100644 (file)
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -6,6 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .png .gpg-error .gcrypt .gnutls .mpcdec \
         .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
         .dx_headers .dshow_headers .gecko-win32 .dca \
-        .lua .tag .fontconfig .portaudio .kate .libass \
+        .lua .tag .fontconfig .portaudio .kate .libass .zvbi \
         .aclocal
 #       .daap .cddb .cdio .vcdimager

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c43931b0c2abbd5ba9f73541a50d8d7652cda16f..a85350ec696499cc486b4e576ffe37571a295e9c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1761,7 +1761,7 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-       (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; autoreconf)
+       (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf)
 endif
 
 ifdef HAVE_WIN32
@@ -1771,8 +1771,12 @@ else
 endif
 ifdef HAVE_DARWIN_OS
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
+else
+ifdef HAVE_WIN32
+       (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
 else
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
+endif
 endif
        $(INSTALL_NAME)
        touch $@
@@ -2362,7 +2366,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
 
 .pthreads: pthreads
-       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a $(PREFIX)/lib/)
+       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.{a,dll} $(PREFIX)/lib/)
        $(INSTALL_NAME)
        touch $@
 

diff --git a/extras/contrib/src/Patches/zvbi-makefile.patch b/extras/contrib/src/Patches/zvbi-makefile.patch
new file mode 100644 (file)
index 0000000..321b9da
--- /dev/null
+++ b/extras/contrib/src/Patches/zvbi-makefile.patch
@@ -0,0 +1,16 @@
+--- zvbi/Makefile.am.orig      2008-10-14 08:51:32.000000000 +0200
++++ zvbi/Makefile.am   2008-10-14 08:51:47.000000000 +0200
+@@ -19,13 +19,7 @@ DISTCLEANFILES = site_def.h
+ # Attn order matters.
+ SUBDIRS = \
+       m4 \
+-      src \
+-      $(proxy_dirs) \
+-      contrib \
+-      examples \
+-      test \
+-      po \
+-      doc
++      src
+
+ ACLOCAL_AMFLAGS = -I m4

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 9ff65710cb6e8caf1d7d4b5ba87e63f9a1185d4f..bf13e766985056b5b2ae261f4eb7541fb169b1e2 100755 (executable)
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -17,7 +17,7 @@
       --enable-dca \
       --enable-libass \
       --enable-x264 \
-      --disable-zvbi --enable-telx \
+      --enable-zvbi --disable-telx \
       --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
       --enable-shout \
       --enable-goom \
@@ -25,7 +25,7 @@
       --enable-portaudio \
       --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-qt4 \
-      --enable-wxwidgets --with-wx-config-path=/usr/win32/lib/wx/config \
+      --disable-wxwidgets \
       --with-freetype-config-path=/usr/win32/bin \
       --with-fribidi-config-path=/usr/win32/bin \
       --with-xml2-config-path=/usr/win32/bin \