Ticket #11793: patch.txt

File patch.txt, 4.8 KB (added by Jerry Rubinow <jerrymr@…>, 6 years ago)
Line 
1--- mythbuild.sh.orig   2013-08-28 21:35:35 -0400
2+++ mythbuild.sh        2013-08-28 22:20:21 -0400
3@@ -123,7 +123,7 @@
4 : ${FLAC:="flac-1.2.1"}
5 : ${FLAC_URL:="http://$SOURCEFORGE/project/flac/flac-src/$FLAC-src/$FLAC.tar.gz"}
6 : ${LIBCDIO:="libcdio-0.82"}
7-: ${LIBCDIO_URL:="ftp://mirror.cict.fr/gnu/libcdio/$LIBCDIO.tar.gz"}
8+: ${LIBCDIO_URL:="ftp.gnu.org/gnu/libcdio/$LIBCDIO.tar.gz"}
9 : ${TAGLIB:="taglib-1.6.3"}
10 : ${TAGLIB_URL:="http://developer.kde.org/~wheeler/files/src/$TAGLIB.tar.gz"}
11 : ${FFTW:="fftw-3.2.2"}
12@@ -139,25 +139,25 @@
13 : ${LIBXSLT:="libxslt-1.1.26"}
14 : ${LIBXSLT_URL:="ftp://xmlsoft.org/libxslt/${LIBXSLT}.tar.gz"}
15 # 16-Sep-2011 latest: mysql-5.5.16
16-: ${MYSQL:="mysql-5.1.58"}
17+: ${MYSQL:="mysql-5.1.71"}
18 : ${MYSQL_URL:="http://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQL:6:3}/$MYSQL.tar.gz"}
19 # Pre-built win32 install. NB mysql-5.1 requires winXP-SP2, 5.0 works on win2k
20 # 5.0.89 unavailable 11-feb-11
21 #: ${MYSQLW:="mysql-5.0.89-win32"}
22 # 5.1.55 unavailable 15-sep-11
23 #: ${MYSQLW:="mysql-5.1.55-win32"}
24-: ${MYSQLW:="mysql-5.1.58-win32"}
25+: ${MYSQLW:="mysql-5.1.71-win32"}
26 : ${MYSQLW_URL:="ftp://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQLW:6:3}/${MYSQLW/mysql-/mysql-noinstall-}.zip"}
27 #: ${MYSQLW_URL:="ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQL-${MYSQLW:6:3}/${MYSQLW/mysql-/mysql-noinstall-}.zip"}
28 # Pre-built MacOSX install
29-: ${MYSQLM:="mysql-5.1.58-osx10.6-x86"}
30+: ${MYSQLM:="mysql-5.1.71-osx10.6-x86"}
31 : ${MYSQLM_URL:="ftp://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQLM:6:3}/$MYSQLM.tar.gz"}
32 # Pre-built MacOSX powerpc
33 : ${MYSQLX:="mysql-standard-4.1.22-apple-darwin7.9.0-powerpc"}
34 : ${MYSQLX_URL:="ftp://mirrors.ircam.fr/pub/mysql/Downloads/MySQL-${MYSQLX:15:3}/$MYSQLX.tar.gz"}
35-#: ${QT:="qt-everywhere-opensource-src-4.7.4"} # Builds for host OK but win32 & mac need updated patches
36-: ${QT:="qt-everywhere-opensource-src-4.7.0"}
37-: ${QT_URL:="http://get.qt.nokia.com/qt/source/$QT.tar.gz"}
38+#: ${QT:="qt-everywhere-opensource-src-4.8.5"} # Builds for host OK but win32 & mac need updated patches
39+: ${QT:="qt-everywhere-opensource-src-4.8.5"}
40+: ${QT_URL:="http://download.qt-project.org/official_releases/qt/4.8/4.8.5/$QT.tar.gz"}
41 # Configurable libraries
42 readonly packages1="MYTHTV MYTHPLUGINS QT MYSQL FREETYPE LAME LIBEXIF LIBXML2"
43 readonly packages2="LIBXSLT LIBOGG LIBVORBIS FLAC LIBCDIO TAGLIB FFTW LIBSDL"
44@@ -508,6 +508,7 @@
45 # $1= URL $2= dir
46 function gitclone() {
47     banner "git clone $*"
48+    git config --global core.autocrlf false
49     git clone "$@"
50 }
51 
52@@ -2079,7 +2080,7 @@
53     case "$MYTHVER" in
54         0.23*) args="$args --disable-directfb" ;;
55         0.24*) args="$args --disable-directfb --enable-vaapi" ;;
56-        ""|0.25*|master) args="$args --enable-vaapi" ;;
57+        ""|0.25*|0.26*|master) args="$args --enable-vaapi" ;;
58     esac
59     rprefix=".."
60     case "$MYTHTARGET" in
61@@ -2180,7 +2181,7 @@
62     plugins="--enable-all --enable-fftw"
63     case "$MYTHVER" in
64         0.23*|0.24*) plugins="$plugins --enable-libvisual" ;;
65-        ""|0.25*|master) ;;
66+        ""|0.25*|0.26*|master) ;;
67     esac
68 
69     if ! isdebug QT ; then
70@@ -2189,7 +2190,7 @@
71         [ "$MYTHNETVISION" = "yes" ] || plugins="$plugins --disable-mythnetvision"
72         case "$MYTHVER" in
73             ""|0.23*|0.24*) [ "$MYTHWEATHER" = "yes" ] || plugins="$plugins --disable-mythweather" ;;
74-            0.25*|master) ;;
75+            0.25*|0.26*|master) ;;
76         esac
77     fi
78 
79@@ -2286,24 +2287,25 @@
80         *-master) MYTHVER="master" ;;
81         *-0*24)   MYTHVER="0.24" ;;
82         *-0*25)   MYTHVER="0.25" ;;
83+        *-0*26)   MYTHVER="0.26" ;;
84     esac
85 fi
86 case "$MYTHVER" in
87     0.23*)        mythlibs="$mythlibs mythdb" ;;
88     0.24*)        mythlibs="$mythlibs mythdb mythmetadata" ;;
89-    0.25*|master) mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver" ;;
90+    0.25*|0.26*|master) mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver" ;;
91     *)            mythlibs="$mythlibs mythbase mythmetadata mythservicecontracts mythprotoserver"
92                   echo "WARNING Installation untested with this version." ;;
93 esac
94 ffmpeglibs="mythavcodec mythavformat mythavutil mythswscale"
95 case "$MYTHVER" in
96     0.24*|0.23*)     ffmpeglibs="$ffmpeglibs mythavcore mythpostproc" ;;
97-    0.25*|master|"") ffmpeglibs="$ffmpeglibs mythpostproc" ;;
98+    0.25*|0.26*|master|"") ffmpeglibs="$ffmpeglibs mythpostproc" ;;
99 esac
100 xtralibs="xml2 xslt freetype mp3lame dvdcss exif ogg vorbis vorbisenc tag cdio cdio_cdda cdio_paranoia udf visual-0.4"
101 QTDLLS="QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtWebKit QtXml Qt3Support"
102 case "$MYTHVER" in
103-    ""|0.25*|master) QTDLLS="$QTDLLS QtScript" ;;
104+    ""|0.25*|0.26*|master) QTDLLS="$QTDLLS QtScript" ;;
105 esac
106 
107 if isWinTarget ; then