|
100.1.295
by Mario Limonciello
configure_mythplugins_without_mythtv_installed: refresh |
1 |
Index: mythtv-master/mythplugins/configure
|
|
100.5.1
by Mario Limonciello
first go at merging into a large package |
2 |
===================================================================
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
3 |
--- mythtv-master.orig/mythplugins/configure 2012-03-05 00:06:33.000000000 -0600
|
4 |
+++ mythtv-master/mythplugins/configure 2012-03-05 00:20:57.403144009 -0600
|
|
5 |
@@ -303,6 +303,7 @@
|
|
|
338
by Mario Limonciello
Fix the installation of mythmusic. (LP: #672045) |
6 |
prefix="/usr/local" |
7 |
libdir_name="lib" |
|
8 |
sysroot="" |
|
9 |
+mythroot=""
|
|
|
100.1.354
by Mario Limonciello
refresh patches for changes upstream |
10 |
ln_s="ln -sf" |
|
338
by Mario Limonciello
Fix the installation of mythmusic. (LP: #672045) |
11 |
|
12 |
logfile="config.ep" |
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
13 |
@@ -322,7 +323,8 @@
|
|
338
by Mario Limonciello
Fix the installation of mythmusic. (LP: #672045) |
14 |
|
15 |
Generic options: |
|
16 |
--prefix=PREFIX MythTV install location PREFIX [$prefix] |
|
17 |
- --sysroot=SYSROOT MythTV sysroot location SYSROOT [$sysroot]
|
|
18 |
+ --sysroot=SYSROOT General sysroot location SYSROOT [$sysroot]
|
|
19 |
+ --mythroot=SYSROOT MythTV specific sysroot location [$mythroot]
|
|
20 |
--qmake=QMAKE use specified qmake [$qmake] |
|
21 |
--python=PATH Force a specific python executable to use [$python] |
|
22 |
--libdir-name=LIBNAME install/look for libs in PREFIX/LIBNAME [$libdir_name] |
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
23 |
@@ -394,6 +396,7 @@
|
|
338
by Mario Limonciello
Fix the installation of mythmusic. (LP: #672045) |
24 |
qmake |
25 |
python |
|
26 |
sysroot |
|
27 |
+ mythroot
|
|
28 |
" |
|
29 |
||
30 |
CONFIGURATION_OPTS="" |
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
31 |
@@ -462,6 +465,7 @@
|
|
100.5.6
by Mario Limonciello
modify the configure_mythplugins_without_mythtv_installed.patch to actually modify mythconfig.mak and disable the python mythnetvision check instead of hackery in debian/rules |
32 |
from distutils.sysconfig import get_python_lib |
33 |
import sys |
|
34 |
sys.path.append(get_python_lib(prefix='${prefix}'))
|
|
35 |
+#sys.path.append('debian/libmyth-python/usr/lib/python2.6/dist-packages')
|
|
36 |
try: |
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
37 |
import $lib |
|
100.5.6
by Mario Limonciello
modify the configure_mythplugins_without_mythtv_installed.patch to actually modify mythconfig.mak and disable the python mythnetvision check instead of hackery in debian/rules |
38 |
except: |
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
39 |
@@ -525,7 +529,11 @@
|
40 |
} |
|
41 |
||
42 |
# bring in mythtv config |
|
43 |
-if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
|
|
44 |
+if [ -e $mythroot$prefix/include/mythtv/mythconfig.mak ] ; then
|
|
45 |
+ rm mythconfig.mak 2> /dev/null
|
|
46 |
+ cp $mythroot$prefix/include/mythtv/mythconfig.mak mythconfig.mak
|
|
47 |
+ sed -i -e "s,^SYSROOT\=.*,SYSROOT=$mythroot,g" mythconfig.mak
|
|
48 |
+elif [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
|
|
49 |
rm mythconfig.mak 2> /dev/null |
|
50 |
${ln_s} $prefix/include/mythtv/mythconfig.mak mythconfig.mak
|
|
51 |
else |
|
52 |
@@ -584,7 +592,7 @@
|
|
|
100.5.6
by Mario Limonciello
modify the configure_mythplugins_without_mythtv_installed.patch to actually modify mythconfig.mak and disable the python mythnetvision check instead of hackery in debian/rules |
53 |
disable netvision |
54 |
} |
|
55 |
||
56 |
- check_py_lib MythTV || disable_netvision "MythTV Python bindings (MythTV)"
|
|
57 |
+ #check_py_lib MythTV || disable_netvision "MythTV Python bindings (MythTV)"
|
|
58 |
check_py_lib pycurl || disable_netvision "Python pycurl library (pycurl)" |
|
59 |
check_py_lib lxml || disable_netvision "Python lxml library (lxml)" |
|
60 |
check_py_lib xml || disable_netvision "Python XML library (xml)" |
|
|
100.1.295
by Mario Limonciello
configure_mythplugins_without_mythtv_installed: refresh |
61 |
Index: mythtv-master/mythplugins/programs-libs.pro
|
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
62 |
===================================================================
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
63 |
--- mythtv-master.orig/mythplugins/programs-libs.pro 2012-02-23 14:13:57.000000000 -0600
|
64 |
+++ mythtv-master/mythplugins/programs-libs.pro 2012-03-05 00:19:18.107253175 -0600
|
|
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
65 |
@@ -4,7 +4,7 @@
|
66 |
INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmyth
|
|
67 |
DEPENDPATH *= $${INCLUDEPATH}
|
|
68 |
||
|
100.1.304
by Mario Limonciello
refresh patches for changes upstream |
69 |
-LIBS += -L$${LIBDIR} $$EXTRA_LIBS -lmythbase-$$LIBVERSION
|
70 |
+LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythbase-$$LIBVERSION
|
|
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
71 |
LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION |
|
100.1.323
by Mario Limonciello
refresh configure_mythplugins_without_mythtv_installed.patch |
72 |
LIBS += -lmythservicecontracts-$$LIBVERSION |
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
73 |
LIBS += -lmythavcodec |
|
100.1.295
by Mario Limonciello
configure_mythplugins_without_mythtv_installed: refresh |
74 |
Index: mythtv-master/mythplugins/targetdep.pro
|
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
75 |
===================================================================
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
76 |
--- mythtv-master.orig/mythplugins/targetdep.pro 2012-02-23 14:13:57.000000000 -0600
|
77 |
+++ mythtv-master/mythplugins/targetdep.pro 2012-03-05 00:19:18.107253175 -0600
|
|
|
100.5.14
by Mario Limonciello
hardcode in the two .pro files where to find dependencies rather than changing the entire libdir. entire libdir was causing unexpected side effects |
78 |
@@ -10,7 +10,7 @@
|
79 |
MYTH_LIB_EXT =$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
|
|
80 |
||
81 |
||
82 |
-DEPLIBS = $${LIBDIR}
|
|
83 |
+DEPLIBS = $${SYSROOT}$${LIBDIR}
|
|
84 |
||
85 |
# On Windows, dlls were installed with exes: |
|
86 |
mingw : DEPLIBS = $${PREFIX}/bin
|
|
|
100.1.295
by Mario Limonciello
configure_mythplugins_without_mythtv_installed: refresh |
87 |
Index: mythtv-master/mythplugins/mytharchive/mytharchive/mytharchive.pro
|
|
343
by Mario Limonciello
Modify configure_mythplugins_without_mythtv_installed.patch to remove |
88 |
===================================================================
|
|
100.1.424
by Mario Limonciello
Update configure without install patch. |
89 |
--- mythtv-master.orig/mythplugins/mytharchive/mytharchive/mytharchive.pro 2012-02-23 14:13:57.000000000 -0600
|
90 |
+++ mythtv-master/mythplugins/mytharchive/mytharchive/mytharchive.pro 2012-03-05 00:19:18.107253175 -0600
|
|
|
100.1.347
by Mario Limonciello
refresh patches to prevent FTBS |
91 |
@@ -33,28 +33,28 @@
|
|
343
by Mario Limonciello
Modify configure_mythplugins_without_mythtv_installed.patch to remove |
92 |
SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp |
93 |
SOURCES += exportnative.cpp importnative.cpp |
|
94 |
||
95 |
-burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
|
|
96 |
+burnuifiles.path = $${PREFIX}/share/mythtv/themes/default
|
|
97 |
burnuifiles.files = mythburn-ui.xml |
|
98 |
||
99 |
-scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts
|
|
100 |
+scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts
|
|
101 |
scriptfiles.files = ../mythburn/scripts/* |
|
102 |
||
103 |
-introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro
|
|
104 |
+introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro
|
|
105 |
introfiles.files = ../mythburn/intro/*.mpg |
|
106 |
||
107 |
-musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music
|
|
108 |
+musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music
|
|
109 |
musicfiles.files = ../mythburn/music/*.ac3 |
|
110 |
||
111 |
-imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images
|
|
112 |
+imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images
|
|
113 |
imagefiles.files = ../mythburn/images/*.png |
|
114 |
||
115 |
-themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes
|
|
116 |
+themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes
|
|
117 |
themefiles.files = ../mythburn/themes/* |
|
118 |
||
119 |
-profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles
|
|
120 |
+profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles
|
|
121 |
profilefiles.files = ../mythburn/encoder_profiles/*.xml |
|
122 |
||
123 |
-nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
|
|
124 |
+nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default
|
|
|
100.1.292
by Mario Limonciello
configure_mythplugins_without_mythtv_installed.patch: refresh. |
125 |
nativeuifiles.files = mythnative-ui.xml |
|
343
by Mario Limonciello
Modify configure_mythplugins_without_mythtv_installed.patch to remove |
126 |
|
|
100.1.292
by Mario Limonciello
configure_mythplugins_without_mythtv_installed.patch: refresh. |
127 |
INSTALLS += scriptfiles introfiles themefiles imagefiles musicfiles |