Ticket #11591: packaging.patches.20130611.mingw

File packaging.patches.20130611.mingw, 6.9 KB (added by Mark Spieth, 8 years ago)
Line 
1patches for mingw
2
3From: Mark Spieth <mspieth@digivation.com.au>
4
5
6---
7 Win32/mythbuild.sh |   54 ++++++++++++++++++++++++++++++++++++++--------------
8 1 file changed, 39 insertions(+), 15 deletions(-)
9
10diff --git a/Win32/mythbuild.sh b/Win32/mythbuild.sh
11index 4fb21c6..018a5c6 100755
12--- a/Win32/mythbuild.sh
13+++ b/Win32/mythbuild.sh
14@@ -139,14 +139,16 @@ readonly myargs="$*"
15 : ${LIBXSLT:="libxslt-1.1.26"}
16 : ${LIBXSLT_URL:="ftp://xmlsoft.org/libxslt/${LIBXSLT}.tar.gz"}
17 # 16-Sep-2011 latest: mysql-5.5.16
18-: ${MYSQL:="mysql-5.1.58"}
19+#: ${MYSQL:="mysql-5.1.58"}
20+: ${MYSQL:="mysql-5.1.65"}
21 : ${MYSQL_URL:="http://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQL:6:3}/$MYSQL.tar.gz"}
22 # Pre-built win32 install. NB mysql-5.1 requires winXP-SP2, 5.0 works on win2k
23 # 5.0.89 unavailable 11-feb-11
24 #: ${MYSQLW:="mysql-5.0.89-win32"}
25 # 5.1.55 unavailable 15-sep-11
26 #: ${MYSQLW:="mysql-5.1.55-win32"}
27-: ${MYSQLW:="mysql-5.1.58-win32"}
28+#: ${MYSQLW:="mysql-5.1.58-win32"}
29+: ${MYSQLW:="mysql-5.1.65-win32"}
30 : ${MYSQLW_URL:="ftp://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQLW:6:3}/${MYSQLW/mysql-/mysql-noinstall-}.zip"}
31 #: ${MYSQLW_URL:="ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQL-${MYSQLW:6:3}/${MYSQLW/mysql-/mysql-noinstall-}.zip"}
32 # Pre-built MacOSX install
33@@ -156,8 +158,10 @@ readonly myargs="$*"
34 : ${MYSQLX:="mysql-standard-4.1.22-apple-darwin7.9.0-powerpc"}
35 : ${MYSQLX_URL:="ftp://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQLX:15:3}/$MYSQLX.tar.gz"}
36 #: ${QT:="qt-everywhere-opensource-src-4.7.4"} # Builds for host OK but win32 & mac need updated patches
37-: ${QT:="qt-everywhere-opensource-src-4.7.0"}
38-: ${QT_URL:="http://get.qt.nokia.com/qt/source/$QT.tar.gz"}
39+#: ${QT:="qt-everywhere-opensource-src-4.7.0"}
40+: ${QT:="qt-everywhere-opensource-src-4.8.4"}
41+#: ${QT_URL:="http://get.qt.nokia.com/qt/source/$QT.tar.gz"}
42+: ${QT_URL:="http://releases.qt-project.org/qt4/source/$QT.tar.gz"}
43 # Configurable libraries
44 readonly packages1="MYTHTV MYTHPLUGINS QT MYSQL FREETYPE LAME LIBEXIF LIBXML2"
45 readonly packages2="LIBXSLT LIBOGG LIBVORBIS FLAC LIBCDIO TAGLIB FFTW LIBSDL"
46@@ -985,8 +989,8 @@ if ! git --version >/dev/null 2>&1 ; then
47     if [ "$MSYSTEM" != "MINGW32" ]; then
48         install_pkg git-core
49     else
50-        gitexe="c:\Program Files\Git\bin\git.exe"
51-        gitexe32="C:\Program Files (x86)\Git\bin\git.exe"
52+        gitexe="$PROGRAMFILES\Git\bin\git.exe"
53+        gitexe32="$SYSTEMDRIVE\Program Files (x86)\Git\bin\git.exe"
54         if [ ! -e "$gitexe" -a ! -e "$gitexe32" ]; then
55             name=$WINGIT; url=$WINGIT_URL; arc=`basename "$url"`
56             [ ! -e "$arc" ] && download "$url"
57@@ -1877,6 +1881,7 @@ if [ ! -e "$stampconfig.$debug" -o -n "${!compcfg}" -o ! -e Makefile ]; then
58 
59     if [ "$MSYSTEM" = "MINGW32" ]; then
60         args="$args -I $incdir/mysql -L `pwd -W`/../$MYSQLW/lib/opt -l mysql"
61+       export QMAKESPEC=win32-g++
62         set -x
63         cmd /c "configure.exe $args ${!compcfg}"
64         set +x
65@@ -2011,6 +2016,11 @@ elif [ "$clean" = "yes" ]; then
66 fi
67 
68 mythtag=$( git describe)
69+case "$MYTHVER" in
70+    master)
71+        mythtag="master-`date +%F`"
72+        ;;
73+esac
74 banner "Building $name branch $branch ($MYTHBUILD)"
75 
76 # Apply patches
77@@ -2079,7 +2089,7 @@ if [ ! -e "$stampconfig${MYTHBUILD:+.$MYTHBUILD}" -o -n "$MYTHTV_CFG" \
78     case "$MYTHVER" in
79         0.23*) args="$args --disable-directfb" ;;
80         0.24*) args="$args --disable-directfb --enable-vaapi" ;;
81-        ""|0.25*|master) args="$args --enable-vaapi" ;;
82+        ""|0.25*|0.26*|0.27*|master) args="$args --enable-vaapi" ;;
83     esac
84     rprefix=".."
85     case "$MYTHTARGET" in
86@@ -2102,6 +2112,8 @@ if [ ! -e "$stampconfig${MYTHBUILD:+.$MYTHBUILD}" -o -n "$MYTHTV_CFG" \
87             # Disable symbol-visibility or build problems on 0.24 & 0.23
88             # Also disabled on master to quieten warnings which otherwise hide real probs
89             args="$args --disable-symbol-visibility"
90+            args="$args --disable-w32threads"
91+            args="$args --disable-vaapi"
92         ;;
93         MacOSX*)
94             targetos="darwin"
95@@ -2189,7 +2201,7 @@ if [ ! -e "$stampconfig${MYTHBUILD:+.$MYTHBUILD}" -o -n "$MYTHPLUGINS_CFG" \
96         [ "$MYTHNETVISION" = "yes" ] || plugins="$plugins --disable-mythnetvision"
97         case "$MYTHVER" in
98             ""|0.23*|0.24*) [ "$MYTHWEATHER" = "yes" ] || plugins="$plugins --disable-mythweather" ;;
99-            0.25*|master) ;;
100+            0.25*|0.26*|master) ;;
101         esac
102     fi
103 
104@@ -2280,30 +2292,35 @@ fi
105 ###############################################################################
106 # Create the installation
107 ###############################################################################
108-mythlibs="myth mythfreemheg mythtv mythui mythupnp mythlivemedia"
109+#mythlibs="myth mythfreemheg mythtv mythui mythupnp mythlivemedia"
110+mythlibs="myth mythfreemheg mythtv mythui mythupnp"
111+mythextlibs=""
112 if [ -z "$MYTHVER" ]; then
113     case "$branch" in
114         *-master) MYTHVER="master" ;;
115         *-0*24)   MYTHVER="0.24" ;;
116         *-0*25)   MYTHVER="0.25" ;;
117+        *-0*26)   MYTHVER="0.26" ;;
118     esac
119 fi
120 case "$MYTHVER" in
121-    0.23*)        mythlibs="$mythlibs mythdb" ;;
122-    0.24*)        mythlibs="$mythlibs mythdb mythmetadata" ;;
123-    0.25*|master) mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver" ;;
124+    0.23*)        mythlibs="$mythlibs mythdb mythlivemedia" ;;
125+    0.24*)        mythlibs="$mythlibs mythdb mythmetadata mythlivemedia" ;;
126+    0.25*|0.26*)  mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver mythlivemedia" ;;
127+    master)       mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver"
128+                  mythextlibs="$mythextlibs mythnzmqt mythqjson mythzmq" ;;
129     *)            mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver"
130                   echo "WARNING Installation untested with this version." ;;
131 esac
132-ffmpeglibs="mythavcodec mythavformat mythavutil mythswscale"
133+ffmpeglibs="mythavcodec mythavformat mythavutil mythswscale mythswresample"
134 case "$MYTHVER" in
135     0.24*|0.23*)     ffmpeglibs="$ffmpeglibs mythavcore mythpostproc" ;;
136-    0.25*|master|"") ffmpeglibs="$ffmpeglibs mythpostproc" ;;
137+    0.25*|0.26*|master|"") ffmpeglibs="$ffmpeglibs mythpostproc" ;;
138 esac
139 xtralibs="xml2 xslt freetype mp3lame dvdcss exif ogg vorbis vorbisenc tag cdio cdio_cdda cdio_paranoia udf visual-0.4"
140 QTDLLS="QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtWebKit QtXml Qt3Support"
141 case "$MYTHVER" in
142-    ""|0.25*|master) QTDLLS="$QTDLLS QtScript" ;;
143+    ""|0.25*|0.26*|master) QTDLLS="$QTDLLS QtScript" ;;
144 esac
145 
146 if isWinTarget ; then
147@@ -2344,6 +2361,13 @@ if isWinTarget ; then
148         done
149     done
150 
151+    # mythextlibs
152+    for lib in $mythextlibs ; do
153+        for file in {$bindir,$libdir}/{lib,}$lib.dll ; do
154+            [ -e "$file" ] && ln -s "$file" .
155+        done
156+    done
157+
158     # External libs
159     for lib in $xtralibs ; do
160         for file in $bindir/lib$lib-*.dll ; do