From ea123678d957d0706c030a35f18026d163b0cad9 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 23 Nov 2010 21:38:52 +0100 Subject: DVDPlayer: add missing linker flags for libdreamdvd --- lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) 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@ -- cgit v1.2.3 From 30d08880e13f81aa3aa6cb163e2037d1b98e20e4 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 23 Nov 2010 21:39:47 +0100 Subject: configure: make --without-po the default (refs #425) --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 48fea647..605431b9 100644 --- a/configure.ac +++ b/configure.ac @@ -86,8 +86,8 @@ if test "$with_memcheck" = "yes"; then fi AC_ARG_WITH(po, - AS_HELP_STRING([--without-po],[disable updating of po files]), - [with_po="$withval"],[with_po="yes"]) + AS_HELP_STRING([--with-po],[enable updating of po files]), + [with_po="$withval"],[with_po="no"]) AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -- cgit v1.2.3 From 4e8cc699a9a33db131ab29ea55b1993558eda1e0 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 1 Dec 2010 01:23:06 +0100 Subject: configure.ac: set package version to 3.0.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 605431b9..5eadfb51 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net]) +AC_INIT([enigma2],[3.0.0],[enigma2-devel@lists.elitedvb.net]) AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability]) AC_CONFIG_HEADERS([enigma2_config.h]) -- cgit v1.2.3 From fb41a54877f82982b88a89aecd473f1089cc5252 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 1 Dec 2010 01:27:40 +0100 Subject: configure.ac: move some gettext checks to conditional block --- configure.ac | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 5eadfb51..6e77e497 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h]) -AC_PATH_PROG(MSGFMT,[msgfmt]) -AC_PATH_PROG(MSGINIT,[msginit]) -AC_PATH_PROG(MSGMERGE,[msgmerge]) -AC_PATH_PROG(MSGUNIQ,[msguniq]) -AC_PATH_PROG(XGETTEXT,[xgettext]) -if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then - AC_MSG_ERROR([Could not find required gettext tools]) -fi +AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt)) AM_PATH_PYTHON AX_PYTHON_DEVEL @@ -88,6 +81,15 @@ fi AC_ARG_WITH(po, AS_HELP_STRING([--with-po],[enable updating of po files]), [with_po="$withval"],[with_po="no"]) +if test "$with_po" = "yes"; then + AC_PATH_PROG(MSGINIT, msginit) + AC_PATH_PROG(MSGMERGE, msgmerge) + AC_PATH_PROG(MSGUNIQ, msguniq) + AC_PATH_PROG(XGETTEXT, xgettext) + if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then + AC_MSG_ERROR([Could not find required gettext tools]) + fi +fi AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -- cgit v1.2.3 From 2c83d31ceec4b7014783a8c207b66b8f5ae0c318 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 1 Dec 2010 01:30:32 +0100 Subject: update and install enigma2.pc --- Makefile.am | 3 +++ configure.ac | 6 +++++- enigma2.pc.in | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ab2d1639..ff252e60 100755 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,9 @@ install_PYTHON = \ keyids.py keymapparser.py mytest.py skin.py timer.py tools.py GlobalActions.py \ e2reactor.py +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = enigma2.pc + metadir = $(datadir)/meta meta_DATA = index-enigma2.xml CLEANFILES = index-enigma2.xml diff --git a/configure.ac b/configure.ac index 6e77e497..0c54f5bf 100644 --- a/configure.ac +++ b/configure.ac @@ -92,8 +92,12 @@ if test "$with_po" = "yes"; then fi AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") +ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions" +AC_SUBST(ENIGMA2_CFLAGS) + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall" +CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall" +CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS" AC_CONFIG_FILES([ Makefile diff --git a/enigma2.pc.in b/enigma2.pc.in index 01ba4341..f34d904d 100644 --- a/enigma2.pc.in +++ b/enigma2.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: enigma2 Description: Enigma2 Version: @VERSION@ -Libs: -Cflags: -I${includedir}/enigma2 +Cflags: -I${includedir}/enigma2 @ENIGMA2_CFLAGS@ +Requires.private: sigc++-1.2 -- cgit v1.2.3 From 87ab43fed2f24ba9454359583ac9cb3f17c295e1 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sun, 5 Dec 2010 03:59:12 +0100 Subject: generate empty version.h if .git is not available --- main/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main/Makefile.am b/main/Makefile.am index 0ed4d717..137ddabc 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -74,6 +74,9 @@ version-intermediate.h: $(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h +else +version.h: + $(AM_V_GEN)touch $@ endif enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) -- cgit v1.2.3 From badb96ea524f426b4bd6814c2fca28477610546b Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sun, 5 Dec 2010 04:09:03 +0100 Subject: Revert "generate empty version.h if .git is not available" This reverts commit 87ab43fed2f24ba9454359583ac9cb3f17c295e1. --- main/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/main/Makefile.am b/main/Makefile.am index 137ddabc..0ed4d717 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -74,9 +74,6 @@ version-intermediate.h: $(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h -else -version.h: - $(AM_V_GEN)touch $@ endif enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) -- cgit v1.2.3 From 0fff842a5f2b4185257aadb6b6a3dfa033a91d72 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sun, 5 Dec 2010 04:10:01 +0100 Subject: also generate version.h if .git is not available --- main/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/Makefile.am b/main/Makefile.am index 0ed4d717..c4513e91 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -64,17 +64,17 @@ ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short` ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags` endif +endif BUILT_SOURCES = version-intermediate.h .INTERMEDIATE: version-intermediate.h .PHONY: version-intermediate.h version-intermediate.h: $(AM_V_GEN)touch $@ - $(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@ - $(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ + -$(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@ + -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h -endif enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) $(AM_V_CXXLD)$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(enigma2_LDFLAGS) $(enigma2_OBJECTS) \ -- cgit v1.2.3 From ef35eeebd55877fa9d1037a685f90b4027a0426e Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 20 Dec 2010 12:26:53 +0100 Subject: version: use compile date if commit date is unavailable. default to "(no branch)" Please update your BitBake! (cd bb && git pull) --- main/Makefile.am | 9 ++------- main/version_info.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/main/Makefile.am b/main/Makefile.am index eadf84e1..888898f4 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -57,8 +57,7 @@ GIT_DIR = $(top_srcdir)/.git GIT = git --git-dir=$(GIT_DIR) if HAVE_FAKE_GIT_DIR -ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4` -ENIGMA2_COMMIT_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'CommitDate:' | cut -d' ' -f2` +ENIGMA2_COMMIT_DATE = `grep '^CommitDate:' $(GIT_DIR)/last_commit_info | cut -d' ' -f2` ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch` else ENIGMA2_COMMIT_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short` @@ -72,11 +71,7 @@ BUILT_SOURCES = version-intermediate.h .PHONY: version-intermediate.h version-intermediate.h: $(AM_V_GEN)touch $@ - -$(AM_V_at)if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \ - echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ - elif [ -n "$(ENIGMA2_DATE)" ]; then \ - echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@; \ - fi + -$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h diff --git a/main/version_info.cpp b/main/version_info.cpp index a846c613..f639eb89 100644 --- a/main/version_info.cpp +++ b/main/version_info.cpp @@ -1,13 +1,13 @@ #include "version_info.h" #include "version.h" -#ifndef ENIGMA2_LAST_CHANGE_DATE -#define ENIGMA2_LAST_CHANGE_DATE __DATE__ +#ifndef ENIGMA2_COMMIT_DATE +#define ENIGMA2_COMMIT_DATE __DATE__ #endif -const char *enigma2_date = ENIGMA2_LAST_CHANGE_DATE; +const char *enigma2_date = ENIGMA2_COMMIT_DATE; #ifndef ENIGMA2_BRANCH -#define ENIGMA2_BRANCH "HEAD" +#define ENIGMA2_BRANCH "(no branch)" #endif const char *enigma2_branch = ENIGMA2_BRANCH; -- cgit v1.2.3 From 1a39cf41ed65d5e7a47b883e338096232ccbc278 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 20 Dec 2010 13:19:58 +0100 Subject: fix previous commit --- main/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile.am b/main/Makefile.am index 888898f4..a65b4ac7 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -71,7 +71,7 @@ BUILT_SOURCES = version-intermediate.h .PHONY: version-intermediate.h version-intermediate.h: $(AM_V_GEN)touch $@ - -$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \ + -$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@ -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@ $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h -- cgit v1.2.3 From 3c282ef6f5bd54f2b0f4cb407d075cf321405b84 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 20 Dec 2010 13:20:41 +0100 Subject: pmt.h: add missing const modifier to capid_pair --- lib/dvb/pmt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 videoStreams; std::vector audioStreams; -- cgit v1.2.3 From e66c53dd065aec5f9aca27ab45dc9e4f6fdc211e Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 20 Dec 2010 22:24:10 +0100 Subject: Harddisk.py: start partition at sector 8 to improve performance of disks with 4KiB sectors --- lib/python/Components/Harddisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3