SOURCES (DEVEL): mythtv-lib64.patch, mythtv-x86_64-configure.patch...
glen
glen at pld-linux.org
Sat Oct 22 17:31:15 CEST 2005
Author: glen Date: Sat Oct 22 15:31:15 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- adjust for 20051019 snap
---- Files affected:
SOURCES:
mythtv-lib64.patch (1.4 -> 1.4.2.1) , mythtv-x86_64-configure.patch (1.2 -> 1.2.2.1)
---- Diffs:
================================================================
Index: SOURCES/mythtv-lib64.patch
diff -u SOURCES/mythtv-lib64.patch:1.4 SOURCES/mythtv-lib64.patch:1.4.2.1
--- SOURCES/mythtv-lib64.patch:1.4 Mon Sep 5 19:37:45 2005
+++ SOURCES/mythtv-lib64.patch Sat Oct 22 17:31:10 2005
@@ -1,324 +1,131 @@
---- ./configure~ 2005-09-04 01:26:56.000000000 +0300
-+++ ./configure 2005-09-04 01:26:58.000000000 +0300
-@@ -13,6 +13,7 @@
- # default parameters
- compile_type="release"
- prefix="/usr/local"
-+libdir="${prefix}/lib"
- mandir=""
- bindir=""
- cross_prefix=""
-@@ -496,6 +497,8 @@
- ;;
- --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
- ;;
-+ --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
-+ ;;
- --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
- ;;
- --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-@@ -1612,6 +1615,10 @@
- bindir="${prefix}/bin"
- fi
-
-+if test x"$libdir" = x""; then
-+libdir="${prefix}/lib"
-+fi
-+
- if test x"$mandir" = x""; then
- mandir="${prefix}/man"
- fi
-@@ -1840,6 +1847,7 @@
-
- echo "PREFIX=$prefix" >> config.mak
- #echo "bindir=$bindir" >> config.mak
-+echo "LIBDIR=$libdir" >> config.mak
- #echo "mandir=$mandir" >> config.mak
- #echo "MAKE=$make" >> config.mak
- echo "QMAKE_CC=$cc" >> config.mak
-
---- ./libs/libmythsamplerate/libmythsamplerate.pro~ 2005-05-06 23:19:54.000000000 +0300
-+++ ./libs/libmythsamplerate/libmythsamplerate.pro 2005-09-04 00:10:56.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- TARGET = mythsamplerate-$$LIBVERSION
- CONFIG += thread staticlib warn_off
--target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
- INSTALLS = target
-
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/filters/adjust/adjust.pro mythtv-0.18.1.fixed/filters/adjust/adjust.pro
---- mythtv-0.18.1/filters/adjust/adjust.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/adjust/adjust.pro 2005-09-04 00:25:07.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/bobdeint/bobdeint.pro mythtv-0.18.1.fixed/filters/bobdeint/bobdeint.pro
---- mythtv-0.18.1/filters/bobdeint/bobdeint.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/bobdeint/bobdeint.pro 2005-09-04 00:25:16.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/convert/convert.pro mythtv-0.18.1.fixed/filters/convert/convert.pro
---- mythtv-0.18.1/filters/convert/convert.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/convert/convert.pro 2005-09-04 00:24:55.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/crop/crop.pro mythtv-0.18.1.fixed/filters/crop/crop.pro
---- mythtv-0.18.1/filters/crop/crop.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/crop/crop.pro 2005-09-04 00:24:52.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/denoise3d/denoise3d.pro mythtv-0.18.1.fixed/filters/denoise3d/denoise3d.pro
---- mythtv-0.18.1/filters/denoise3d/denoise3d.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/denoise3d/denoise3d.pro 2005-09-04 00:25:21.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/force/force.pro mythtv-0.18.1.fixed/filters/force/force.pro
---- mythtv-0.18.1/filters/force/force.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/force/force.pro 2005-09-04 00:24:57.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/invert/invert.pro mythtv-0.18.1.fixed/filters/invert/invert.pro
---- mythtv-0.18.1/filters/invert/invert.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/invert/invert.pro 2005-09-04 00:25:09.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/kerneldeint/kerneldeint.pro mythtv-0.18.1.fixed/filters/kerneldeint/kerneldeint.pro
---- mythtv-0.18.1/filters/kerneldeint/kerneldeint.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/kerneldeint/kerneldeint.pro 2005-09-04 00:25:14.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/linearblend/linearblend.pro mythtv-0.18.1.fixed/filters/linearblend/linearblend.pro
---- mythtv-0.18.1/filters/linearblend/linearblend.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/linearblend/linearblend.pro 2005-09-04 00:24:59.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
-
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/onefield/onefield.pro mythtv-0.18.1.fixed/filters/onefield/onefield.pro
---- mythtv-0.18.1/filters/onefield/onefield.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/onefield/onefield.pro 2005-09-04 00:25:02.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
+--- ./libs/libmyth/mythcontext.cpp~ 2005-04-11 21:59:29.000000000 +0300
++++ ./libs/libmyth/mythcontext.cpp 2005-09-05 20:20:24.000000000 +0300
+@@ -874,7 +878,7 @@
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/filters/postprocess/postprocess.pro mythtv-0.18.1.fixed/filters/postprocess/postprocess.pro
---- mythtv-0.18.1/filters/postprocess/postprocess.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/postprocess/postprocess.pro 2005-09-04 00:25:12.000000000 +0300
-@@ -4,7 +4,7 @@
- TEMPLATE = lib
- CONFIG -= moc qt
- CONFIG += plugin thread
--target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
- INSTALLS = target
+ QString MythContext::GetLibraryDir(void)
+ {
+- return d->m_installprefix + "/lib/mythtv/";
++ return d->m_installprefix + "/lib64/mythtv/";
+ }
- INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec
-diff -ur mythtv-0.18.1/filters/quickdnr/quickdnr.pro mythtv-0.18.1.fixed/filters/quickdnr/quickdnr.pro
---- mythtv-0.18.1/filters/quickdnr/quickdnr.pro 2005-01-29 07:21:36.000000000 +0200
-+++ mythtv-0.18.1.fixed/filters/quickdnr/quickdnr.pro 2005-09-04 00:25:18.000000000 +0300
+ QString MythContext::GetThemesParentDir(void)
+diff -ur mythtv-lib32/filters/filter-common.pro mythtv/filters/filter-common.pro
+--- mythtv-lib32/filters/filter-common.pro 2005-10-18 02:33:41.000000000 +0300
++++ mythtv/filters/filter-common.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
CONFIG -= moc qt
CONFIG += plugin thread
-target.path = $${PREFIX}/lib/mythtv/filters
-+target.path = $${LIBDIR}/mythtv/filters
++target.path = $${PREFIX}/lib64/mythtv/filters
INSTALLS = target
- INCLUDEPATH += ../../libs/libmythtv
-diff -ur mythtv-0.18.1/libs/libavcodec/libavcodec.pro mythtv-0.18.1.fixed/libs/libavcodec/libavcodec.pro
---- mythtv-0.18.1/libs/libavcodec/libavcodec.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libavcodec/libavcodec.pro 2005-09-04 00:24:44.000000000 +0300
+ QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes
+diff -ur mythtv-lib32/libs/libavcodec/libavcodec.pro mythtv/libs/libavcodec/libavcodec.pro
+--- mythtv-lib32/libs/libavcodec/libavcodec.pro 2005-10-18 02:33:32.000000000 +0300
++++ mythtv/libs/libavcodec/libavcodec.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythavcodec-$$LIBVERSION
CONFIG += thread dll warn_off
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libavformat/libavformat.pro mythtv-0.18.1.fixed/libs/libavformat/libavformat.pro
---- mythtv-0.18.1/libs/libavformat/libavformat.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libavformat/libavformat.pro 2005-09-04 00:24:47.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libavformat/libavformat.pro mythtv/libs/libavformat/libavformat.pro
+--- mythtv-lib32/libs/libavformat/libavformat.pro 2005-10-18 02:33:08.000000000 +0300
++++ mythtv/libs/libavformat/libavformat.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythavformat-$$LIBVERSION
CONFIG += thread dll warn_off
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
+ INSTALLS = target
+
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libavutil/libavutil.pro mythtv/libs/libavutil/libavutil.pro
+--- mythtv-lib32/libs/libavutil/libavutil.pro 2005-10-18 02:33:33.000000000 +0300
++++ mythtv/libs/libavutil/libavutil.pro 2005-10-19 20:56:16.000000000 +0300
+@@ -5,7 +5,7 @@
+ TARGET = mythavutil-$$LIBVERSION
+ CONFIG += thread dll warn_off
+ CONFIG -= qt
+-target.path = $${PREFIX}/lib
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libmyth/libmyth.pro mythtv-0.18.1.fixed/libs/libmyth/libmyth.pro
---- mythtv-0.18.1/libs/libmyth/libmyth.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libmyth/libmyth.pro 2005-09-04 00:24:37.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmyth/libmyth.pro mythtv/libs/libmyth/libmyth.pro
+--- mythtv-lib32/libs/libmyth/libmyth.pro 2005-10-18 02:33:16.000000000 +0300
++++ mythtv/libs/libmyth/libmyth.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = myth-$$LIBVERSION
CONFIG += thread dll
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libmythmpeg2/libmythmpeg2.pro mythtv-0.18.1.fixed/libs/libmythmpeg2/libmythmpeg2.pro
---- mythtv-0.18.1/libs/libmythmpeg2/libmythmpeg2.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libmythmpeg2/libmythmpeg2.pro 2005-09-04 00:24:41.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmythmpeg2/libmythmpeg2.pro mythtv/libs/libmythmpeg2/libmythmpeg2.pro
+--- mythtv-lib32/libs/libmythmpeg2/libmythmpeg2.pro 2005-10-18 02:33:03.000000000 +0300
++++ mythtv/libs/libmythmpeg2/libmythmpeg2.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythmpeg2-$$LIBVERSION
CONFIG += thread staticlib warn_off
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
+ INSTALLS = target
+
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmythsamplerate/libmythsamplerate.pro mythtv/libs/libmythsamplerate/libmythsamplerate.pro
+--- mythtv-lib32/libs/libmythsamplerate/libmythsamplerate.pro 2005-10-18 02:33:12.000000000 +0300
++++ mythtv/libs/libmythsamplerate/libmythsamplerate.pro 2005-10-19 20:56:16.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ TARGET = mythsamplerate-$$LIBVERSION
+ CONFIG += thread staticlib warn_off
+-target.path = $${PREFIX}/lib
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libmythsoundtouch/libmythsoundtouch.pro mythtv-0.18.1.fixed/libs/libmythsoundtouch/libmythsoundtouch.pro
---- mythtv-0.18.1/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-09-04 00:24:50.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmythsoundtouch/libmythsoundtouch.pro mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro
+--- mythtv-lib32/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-10-18 02:33:03.000000000 +0300
++++ mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythsoundtouch-$$LIBVERSION
CONFIG += thread staticlib warn_off
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libmythtv/libmythtv.pro mythtv-0.18.1.fixed/libs/libmythtv/libmythtv.pro
---- mythtv-0.18.1/libs/libmythtv/libmythtv.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libmythtv/libmythtv.pro 2005-09-04 00:24:34.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmythtv/libmythtv.pro mythtv/libs/libmythtv/libmythtv.pro
+--- mythtv-lib32/libs/libmythtv/libmythtv.pro 2005-10-18 02:33:02.000000000 +0300
++++ mythtv/libs/libmythtv/libmythtv.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythtv-$$LIBVERSION
CONFIG += thread dll
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
INSTALLS = target
- VERSION = 0.18.1
-diff -ur mythtv-0.18.1/libs/libmythui/libmythui.pro mythtv-0.18.1.fixed/libs/libmythui/libmythui.pro
---- mythtv-0.18.1/libs/libmythui/libmythui.pro 2005-05-06 23:19:54.000000000 +0300
-+++ mythtv-0.18.1.fixed/libs/libmythui/libmythui.pro 2005-09-04 00:24:32.000000000 +0300
+ VERSION = 0.18.0
+diff -ur mythtv-lib32/libs/libmythui/libmythui.pro mythtv/libs/libmythui/libmythui.pro
+--- mythtv-lib32/libs/libmythui/libmythui.pro 2005-10-18 02:33:13.000000000 +0300
++++ mythtv/libs/libmythui/libmythui.pro 2005-10-19 20:56:16.000000000 +0300
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = mythui-$$LIBVERSION
CONFIG += debug thread dll
-target.path = $${PREFIX}/lib
-+target.path = $${LIBDIR}
++target.path = $${PREFIX}/lib64
INSTALLS = target
- INCLUDEPATH += ../../libs/libmyth
- INCLUDEPATH += ../..
---- ./configure~ 2005-09-05 20:10:30.000000000 +0300
-+++ ./configure 2005-09-05 20:10:33.000000000 +0300
-@@ -703,7 +703,7 @@
- LIBPATHS="$LIBPATHS $LP_APPEND"
- done
-
-- LIBPATHS="`echo $LIBPATHS /lib /usr/lib | sed s/'\/ '/' '/g` "
-+ LIBPATHS="`echo $LIBPATHS $libdir /lib /usr/lib | sed s/'\/ '/' '/g` "
-
- HAS_IT="no"
- for LIBPATH in $LIBPATHS ; do
---- ./libs/libmyth/mythcontext.cpp~ 2005-04-11 21:59:29.000000000 +0300
-+++ ./libs/libmyth/mythcontext.cpp 2005-09-05 20:20:24.000000000 +0300
-@@ -41,6 +41,10 @@
- const QString kPluginLibSuffix = ".so";
- #endif
-
-+#ifndef LIBDIR
-+#define LIBDIR "lib"
-+#endif
-+
- MythContext *gContext = NULL;
- QMutex MythContext::verbose_mutex(true);
-
-@@ -874,7 +878,7 @@
- QString MythContext::GetLibraryDir(void)
- {
-- return d->m_installprefix + "/lib/mythtv/";
-+ return d->m_installprefix + "/" + LIBDIR "/mythtv/";
- }
-
- QString MythContext::GetThemesParentDir(void)
---- ./configure~ 2005-09-05 20:25:05.000000000 +0300
-+++ ./configure 2005-09-05 20:25:08.000000000 +0300
-@@ -2394,6 +2394,10 @@
- echo "CONFIG_INCLUDEPATH=$CONFIG_INCLUDEPATH" >> config.mak
- fi
-
-+if test "$_lib" != ""; then
-+ echo "#define LIBDIR \"$_lib\"" >> $TMPH
-+fi
-+
- diff $TMPH config.h >/dev/null 2>&1
- if test $? -ne 0 ; then
- mv -f $TMPH config.h
+ INCLUDEPATH += ../libmyth
================================================================
Index: SOURCES/mythtv-x86_64-configure.patch
diff -u SOURCES/mythtv-x86_64-configure.patch:1.2 SOURCES/mythtv-x86_64-configure.patch:1.2.2.1
--- SOURCES/mythtv-x86_64-configure.patch:1.2 Sun Sep 4 12:47:27 2005
+++ SOURCES/mythtv-x86_64-configure.patch Sat Oct 22 17:31:10 2005
@@ -1,50 +1,11 @@
-based from gentoo
-http://bugs.gentoo.org/show_bug.cgi?id=94664
-
---- ./configure.orig 2005-05-05 08:15:43.000000000 +0100
-+++ ./configure 2005-05-31 23:32:26.000000000 +0100
-@@ -9,6 +9,7 @@
- x86_cpus="i386,i486,i586,i686,pentium,pentiumpro,${x86_mmx_cpus}"
- x86_cmov_cpus="i686,pentiumpro,pentium2,pentium3,pentium3m,pentium-m,pentium4,"
- x86_cmov_cpus="pentium4m,prescott,athlon,athlon-xp,c3-2"
-+x86_64_cpus="x86-64,athlon64,k8,opteron,athlon-fx"
-
- # default parameters
- compile_type="release"
-@@ -223,6 +224,14 @@
- cpu="x86"
- fi
-
-+is_x86_64_cpu() {
-+ expr ",${x86_64_cpus}," : ".*,$1," > /dev/null
-+}
-+
-+if is_x86_64_cpu "$cpu" ; then
-+ cpu="x86_64"
-+fi
-+
- case "$cpu" in
- x86)
- ;;
---- ./configure~ 2005-09-04 11:48:59.000000000 +0300
-+++ ./configure 2005-09-04 11:49:01.000000000 +0300
-@@ -237,12 +237,13 @@
- x86)
+--- ./configure~ 2005-10-19 20:39:45.000000000 +0300
++++ ./configure 2005-10-19 20:54:02.000000000 +0300
+@@ -265,7 +265,7 @@
;;
x86_64)
-- if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
-- -z "`echo $CFLAGS | grep -- -m32`" ]; then
-- cpu="x86_64"
-- else
-- cpu="x86"
-- fi
-+ if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" ]; then
-+ if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
-+ cpu="x86_64"
-+ else
-+ cpu="x86"
-+ fi
-+ fi
- ;;
- # armv4l is a subset of armv5tel
- armv4l|armv5tel)
+ cpu="x86"
+- canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
++ canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+ if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+ if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
+ cpu="x86_64"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mythtv-lib64.patch?r1=1.4&r2=1.4.2.1&f=u
http://cvs.pld-linux.org/SOURCES/mythtv-x86_64-configure.patch?r1=1.2&r2=1.2.2.1&f=u
More information about the pld-cvs-commit
mailing list