diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2011-01-11 16:09:18 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2011-01-11 16:09:18 +0100 |
| commit | 088902285e167e612e0f4ae8ae9f72a3e9079ea4 (patch) | |
| tree | 0a50148e80501b8a3895d240e7568385b3e0d8bc /lib | |
| parent | 6a25698b1ff48bafd6d1656be7f447638cc4b136 (diff) | |
| parent | e66c53dd065aec5f9aca27ab45dc9e4f6fdc211e (diff) | |
| download | enigma2-088902285e167e612e0f4ae8ae9f72a3e9079ea4.tar.gz enigma2-088902285e167e612e0f4ae8ae9f72a3e9079ea4.zip | |
Merge branch 'obi/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb/pmt.h | 2 | ||||
| -rw-r--r-- | lib/python/Components/Harddisk.py | 2 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 5c8fa582..86b634fc 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -185,7 +185,7 @@ public: { uint16_t caid; int capid; - bool operator< (const struct capid_pair &t) { return t.caid < caid; } + bool operator< (const struct capid_pair &t) const { return t.caid < caid; } }; std::vector<videoStream> videoStreams; std::vector<audioStream> audioStreams; diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 0f1a8fca..30a7b609 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -190,7 +190,7 @@ class Harddisk: return (res >> 8) def createPartition(self): - cmd = 'printf "0,\n;\n;\n;\ny\n" | sfdisk -f ' + self.disk_path + cmd = 'printf "8,\n;0,0\n;0,0\n;0,0\ny\n" | sfdisk -f -uS ' + self.disk_path res = system(cmd) return (res >> 8) diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am index 7aaec9bb..3e2ee67c 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am @@ -4,6 +4,8 @@ AM_CPPFLAGS = \ -include Python.h \ -include $(top_builddir)/enigma2_config.h +AM_CXXFLAGS = @LIBDDVD_CFLAGS@ + plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer plugin_LTLIBRARIES = servicedvd.la @@ -13,3 +15,4 @@ servicedvd_la_SOURCES = \ servicedvd.h servicedvd_la_LDFLAGS = -avoid-version -module +servicedvd_la_LIBADD = @LIBDDVD_LIBS@ |