April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ConsoleKit for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at 2014-04-23 17:31:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ConsoleKit (Old) and /work/SRC/openSUSE:Factory/.ConsoleKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ConsoleKit" Changes: -------- --- /work/SRC/openSUSE:Factory/ConsoleKit/ConsoleKit-doc.changes 2014-01-23 15:39:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ConsoleKit.new/ConsoleKit-doc.changes 2014-04-23 17:31:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 15 10:08:29 UTC 2014 - aj(a)suse.com + +- ConsoleKit was moved to /run, fix filelist for this as well. + +------------------------------------------------------------------- ConsoleKit.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.scEmHA/_old 2014-04-23 17:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.scEmHA/_new 2014-04-23 17:31:41.000000000 +0200 @@ -192,7 +192,7 @@ %{_sbindir}/* %{_mandir}/man8/pam_ck_connector.8.gz /%{_lib}/security -%ghost %_localstatedir/run/ConsoleKit +%ghost /run/ConsoleKit %{_datadir}/polkit-1/actions/org.freedesktop.consolekit.policy %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.scEmHA/_old 2014-04-23 17:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.scEmHA/_new 2014-04-23 17:31:41.000000000 +0200 @@ -192,7 +192,7 @@ %{_sbindir}/* %{_mandir}/man8/pam_ck_connector.8.gz /%{_lib}/security -%ghost %_localstatedir/run/ConsoleKit +%ghost /run/ConsoleKit %{_datadir}/polkit-1/actions/org.freedesktop.consolekit.policy %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2014-04-23 17:31:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2014-04-12 08:33:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2014-04-23 17:31:32.000000000 +0200 @@ -39,0 +40,7 @@ +- No longer build against system libraries as that Chromium works + a lot better and crashes less on websites than with system libs + +- Added package depot_tools.tar.gz as that the chromium build now + requires it during the initial build phase. It just contains some + utilities and nothing from it is being installed. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apper for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2014-04-23 17:31:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apper" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2013-11-11 14:43:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2014-04-23 17:31:09.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 20 20:12:45 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.8.2 + * Better Apstream support + * Fixed translation catalog loading + * Fixed memleak + * Fixed accepting multiple license agreements +- Drop 0001-Fix-accept-multiple-licenses.dif and + 0002-Load-the-main-apper-catalog-for-the-applet.diff, merged upstream +- Drop checks for no longer supported versions +- Add Source URL + +------------------------------------------------------------------- Old: ---- 0001-Fix-accept-multiple-licenses.diff 0002-Load-the-main-apper-catalog-for-the-applet.diff apper-0.8.1.tar.bz2 New: ---- apper-0.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.klyoTE/_old 2014-04-23 17:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.klyoTE/_new 2014-04-23 17:31:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,19 @@ # -%if 0%{?suse_version} < 1310 -%define split_plasmoid 1 -%else -%define split_plasmoid 0 -%endif - Name: apper Summary: KDE interface for PackageKit License: GPL-2.0+ and LGPL-3.0+ Group: System/Packages -Version: 0.8.1 +Version: 0.8.2 Release: 0 -Source0: %{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… Source1: 10-opensuse-org.packagekit.updater.js Patch0: apper-ui-fixes.diff # https://bugzilla.novell.com/show_bug.cgi?id=729164 Patch1: apper-no-dbus-service.diff # setting proxy requires polkit permissions - for very little gain Patch2: apper-no-user-proxy.diff -# PATCH-FIX-UPSTREAM 0001-Fix-accept-multiple-licenses.diff bnc#847346, kde#326619 -Patch3: 0001-Fix-accept-multiple-licenses.diff -# PATCH-FIX-UPSTREAM 0002-Load-the-main-apper-catalog-for-the-applet.diff -Patch4: 0002-Load-the-main-apper-catalog-for-the-applet.diff Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.8.8 @@ -48,51 +38,25 @@ Recommends: %{name}-lang = %{version} Provides: org.freedesktop.PackageKit.service Requires: PackageKit >= 0.8.8 -# last used in 11.3 -Provides: kupdateapplet = 0.9.18 -Obsoletes: kupdateapplet <= 0.9.17 -# last used in 11.0 -Provides: kde4-opensuse-updater = 0.8 -Obsoletes: kde4-opensuse-updater < 0.8 - -# last used in 11.3 -Obsoletes: kpackagekit < %{version} -Provides: kpackagekit = %{version} -%if !%{split_plasmoid} Obsoletes: apper-plasmoid < %{version} Provides: apper-plasmoid = %{version} -%endif %kde4_runtime_requires %description KDE interface for PackageKit package management. -%if %{split_plasmoid} -%package plasmoid -Summary: Plasmoid for the Apper Package management -Group: System/Packages -Requires: %{name} = %{version} - -%description plasmoid -The Plasmoids for the Apper Package Management -%endif - %lang_package %prep %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE %make_jobs %install -cd build -%makeinstall -cd .. +%kde4_makeinstall -C build # avoid confusion with yast %suse_update_desktop_file -C "Install, Update or Remove Software Packages" -N "Apper Software Management" %{buildroot}/%{_kde4_servicesdir}/kcm_apper.desktop @@ -120,33 +84,25 @@ %files %defattr(-,root,root) %doc COPYING TODO -%_kde4_libexecdir/apper-pk-session -%_kde4_appsdir/apperd/ -%_kde4_appsdir/apper/ -%_kde4_bindir/apper -%dir %_kde4_libdir/apper -%_kde4_applicationsdir/apper*.desktop -%_kde4_servicesdir/kcm_apper.desktop -%_kde4_servicesdir/kded/apperd.desktop +%{_kde4_libexecdir}/apper-pk-session +%{_kde4_appsdir}/apperd/ +%{_kde4_appsdir}/apper/ +%{_kde4_bindir}/apper +%dir %{_kde4_libdir}/apper +%{_kde4_applicationsdir}/apper*.desktop +%{_kde4_servicesdir}/kcm_apper.desktop +%{_kde4_servicesdir}/kded/apperd.desktop %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%if !%{split_plasmoid} -%_kde4_appsdir/plasma/ -%_kde4_servicesdir/plasma-applet-org.packagekit.updater.desktop +%{_kde4_appsdir}/plasma/ +%{_kde4_servicesdir}/plasma-applet-org.packagekit.updater.desktop %{_kde4_appsdir}/plasma-desktop/updates/10-opensuse-org.packagekit.updater.js -%endif %doc %{_kde4_mandir}/man1/* -%_kde4_libdir/%{name}/libapper.so -%_kde4_modulesdir/*.so +%{_kde4_libdir}/%{name}/libapper.so +%{_kde4_modulesdir}/*.so %config %{_kde4_sysconfdir}/ld.so.conf.d/apper.conf -%_kde4_modulesdir/imports/org/kde/%{name}/ - -%if %{split_plasmoid} -%files plasmoid -%defattr(-,root,root) -%_kde4_appsdir/plasma/ -%_kde4_servicesdir/plasma-applet-org.packagekit.updater.desktop -%{_kde4_appsdir}/plasma-desktop/updates/10-opensuse-org.packagekit.updater.js -%endif +%{_kde4_modulesdir}/imports/org/kde/%{name}/ +%dir %{_kde4_datadir}/appdata +%{_kde4_datadir}/appdata/apper.appdata.xml %files lang -f %{name}.lang %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2014-04-23 17:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2014-04-08 22:36:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2014-04-23 17:31:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 10:09:03 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch, + resolves migration problems from earlier akonadi versions, kde#331867 + +------------------------------------------------------------------- New: ---- 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.n0JvTK/_old 2014-04-23 17:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.n0JvTK/_new 2014-04-23 17:31:03.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: http://download.kde.org/stable/%{rname}/src/%{rname}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch -- resolves migration problems from earlier akonadi versions, kde#331867 +Patch0: 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 BuildRequires: fdupes @@ -68,6 +70,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DWITH_SOPRANO=FALSE ++++++ 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++ >From 4ca8b846baaad48ebbd723f6411f9571a3b0f5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil(a)redhat.com> Date: Tue, 22 Apr 2014 11:28:07 +0200 Subject: [PATCH 1/1] Remove the invalid GID part from PartTable before starting PartTable migration More people than we expected have invalid 'GID' part in their PartTable, which breaks migration to schema 25, because it expects all part types to have a valid name. To work around this fact, we DELETE all parts with name 'GID' from PartTable before starting the actual migration. This will not fix the migration for people with other invalid parts, but I haven't heard of any such. To make this completely bullet-proof, we would need to iterate through all entries, which would be massively slower than current INSERT INTO ... SELECT FROM approach. Distributions, this is a good choice for backporting into 1.12.1 ;-) BUG: 331867 FIXED-IN: 1.12.2 --- server/src/storage/dbupdater.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/src/storage/dbupdater.cpp b/server/src/storage/dbupdater.cpp index ccaf584..d6368b5 100644 --- a/server/src/storage/dbupdater.cpp +++ b/server/src/storage/dbupdater.cpp @@ -261,6 +261,15 @@ bool DbUpdater::complexUpdate_25() } } + { + // It appears that more users than expected have the invalid "GID" part in their + // PartTable, which breaks the migration below (see BKO#331867), so we apply this + // wanna-be fix to remove the invalid part before we start the actual migration. + QueryBuilder qb( QLatin1String( "PartTable" ), QueryBuilder::Delete ); + qb.addValueCondition( QLatin1String( "PartTable.name" ), Query::Equals, QLatin1String( "GID" ) ); + qb.exec(); + } + akDebug() << "Creating a PartTable_new"; { TableDescription description; -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2014-04-23 17:28:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2014-04-06 09:56:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2014-04-23 17:28:17.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 22 06:04:00 UTC 2014 - krahmer(a)suse.com + +- adding baloo DBUS service file (missing in last request) (bnc#866131) + +------------------------------------------------------------------- +Wed Apr 16 13:02:10 UTC 2014 - krahmer(a)suse.com + +- adding baloo DBUS config, formerly nepomuk (bnc#866131) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ config ++++++ --- /var/tmp/diff_new_pack.RhEEL6/_old 2014-04-23 17:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.RhEEL6/_new 2014-04-23 17:28:18.000000000 +0200 @@ -608,7 +608,10 @@ "org.neard.conf", "org.neard.service", # networkmanager-openswan (bnc#808549) - "nm-openswan-service.conf" + "nm-openswan-service.conf", + # baloo, formerly nepomuk (bnc#866131) + "org.kde.baloo.filewatch.conf", + "org.kde.baloo.filewatch.service" )) setOption("PAMModules.WhiteList", ( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcoe-utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package fcoe-utils for openSUSE:Factory checked in at 2014-04-23 17:28:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcoe-utils (Old) and /work/SRC/openSUSE:Factory/.fcoe-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcoe-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/fcoe-utils/fcoe-utils.changes 2014-04-05 14:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcoe-utils.new/fcoe-utils.changes 2014-04-23 17:28:15.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 11 15:08:04 CEST 2014 - hare(a)suse.de + +- Replace patches with upstream version + Remove: 0025-systemctl-cannot-start-fcoemon.socket.patch + Add: 0028-systemctl-cannot-start-fcoemon.socket.patch +- Pull in patches from upstream: + * Really break out of recv_loop in fipvlan (bnc#870300) + Add: 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + * Update documentation + Add: 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + Add: 0027-man-Fix-typo-in-fcoemon-documentation.patch +- Add dependency on libhbalinux2 (bnc#873066) +- Correctly handle options when invoking fcoemon (bnc#872732) + Add: 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch +- Include bnx2fc to SUPPORTED_DRIVERS (bnc#872741) + +------------------------------------------------------------------- Old: ---- 0025-systemctl-cannot-start-fcoemon.socket.patch New: ---- 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch 0027-man-Fix-typo-in-fcoemon-documentation.patch 0028-systemctl-cannot-start-fcoemon.socket.patch 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcoe-utils.spec ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -24,10 +24,11 @@ BuildRequires: libhbalinux2-devel BuildRequires: libtool BuildRequires: open-lldp-devel +BuildRequires: systemd-devel Requires: device-mapper Requires: iproute +Requires: libhbalinux2 Requires: open-lldp -BuildRequires: systemd-devel %systemd_requires Version: 1.0.29 Release: 0 @@ -36,7 +37,6 @@ Group: System/Daemons # git://open-fcoe.org/fcoe/fcoe-utils.git Source0: %{name}-%{version}.tar.xz -Source2: fcoe.config # Patches from git repository Patch1: 0001-man-Fix-small-typo-regarding-fcf-option.patch Patch2: 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch @@ -55,8 +55,6 @@ Patch15: 0015-fipvlan-break-out-of-receive-loop-on-error.patch Patch16: 0016-fipvlan-handle-errors-from-fip-socket-creation.patch Patch17: 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch - -# Patches to be upstreamed Patch18: 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch Patch19: 0019-Fix-build-with-Wl-as-needed.patch Patch20: 0020-Fix-integer-formatting.patch @@ -64,7 +62,13 @@ Patch22: 0022-fcnsq-Fixup-64bit-integer-handling.patch Patch23: 0023-fcoemon-add-systemd-service-file.patch Patch24: 0024-fcoemon-systemd-socket-activation.patch -Patch25: 0025-systemctl-cannot-start-fcoemon.socket.patch +Patch25: 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch +Patch26: 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch +Patch27: 0027-man-Fix-typo-in-fcoemon-documentation.patch + +# Patches to be upstreamed +Patch28: 0028-systemctl-cannot-start-fcoemon.socket.patch +Patch29: 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch # Patches from Fedora Patch101: fcoe-utils-1.0.29-make.patch @@ -102,6 +106,10 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 %patch101 -p1 %build @@ -117,9 +125,6 @@ # unitfile ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfcoe -# config -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/fcoe/config - # contrib files mkdir -p %{buildroot}%{_libexecdir}/fcoe for file in \ ++++++ 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,9 +1,10 @@ -From 51cfb504c434a8a0a1df9fa7c3cd9000c4e53d92 Mon Sep 17 00:00:00 2001 +From 0e5d536b20ed481d5a057e9bfee772b4c53bdb0f Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> -Date: Fri, 6 Dec 2013 11:08:23 +0100 -Subject: Add missing 'DESTDIR' when installing bash completion +Date: Fri, 6 Dec 2013 19:51:51 +0000 +Subject: build: Add missing 'DESTDIR' when installing bash completion Signed-off-by: Hannes Reinecke <hare(a)suse.de> +Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ++++++ 0019-Fix-build-with-Wl-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,12 +1,13 @@ -From a76be731a5e5262abf0c8deadf8f4f541559b9f8 Mon Sep 17 00:00:00 2001 +From 9869390ff1a6ecca1e6599e37128a07d237655e6 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> -Date: Fri, 6 Dec 2013 11:23:34 +0100 -Subject: Fix build with '-Wl,--as-needed' +Date: Fri, 6 Dec 2013 19:51:52 +0000 +Subject: build: Fix build with '-Wl,--as-needed' The libraries need to be specified correctly to get '--as-needed' to work. Signed-off-by: Hannes Reinecke <hare(a)suse.de> +Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ++++++ 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch ++++++ >From fa308a68bda455d7305fc194d716ebc06b6f26c7 Mon Sep 17 00:00:00 2001 From: Robert Love <robert.w.love(a)intel.com> Date: Wed, 18 Dec 2013 11:51:35 -0800 Subject: doc: Update QUICKSTART/INSTALL docs for systemd init file install Update installation instructions so that systemd init files may be installed. Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- INSTALL | 3 +++ QUICKSTART | 3 +++ 2 files changed, 6 insertions(+) diff --git a/INSTALL b/INSTALL index 3abdf07..ea8c95e 100644 --- a/INSTALL +++ b/INSTALL @@ -19,6 +19,9 @@ DEPENDENCIES 1) Bootstrap, configure, make and make install # ./bootstrap.sh + Either execute the next line for System V init script install # rpm --eval "%configure" | sh + or the following line to install systemd unit scripts + # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh # make # make install diff --git a/QUICKSTART b/QUICKSTART index 6fc82b3..c001bc1 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -201,7 +201,10 @@ PROCESS 2) Bootstrap, configure, make and make install # cd fcoe-utils # ./bootstrap.sh + Either execute the next line for System V init script install # rpm --eval "%configure" | sh + or the following line to install systemd unit scripts + # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh # make # make install -- 1.8.1.4 ++++++ 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch ++++++ >From f90bbd76499b71a62f1e7c4ec68a62008031ee8e Mon Sep 17 00:00:00 2001 From: Eddie Wai <eddie.wai(a)broadcom.com> Date: Wed, 5 Mar 2014 14:42:28 +0000 Subject: FIPVLAN: Really break out of the recv_loop upon fip_recv error This patch adds additional code to break out of the recv_loop's while loop upon fip_recv error. This completes the fix from commit 78ea81aaef57b5b40fdc86335a7e6a432a72ad48. Without this, we have seen cases where the recv_loop gets stuck looping indefinitely. Signed-off-by: Eddie Wai <eddie.wai(a)broadcom.com> Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- fipvlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fipvlan.c b/fipvlan.c index 1b8492d..cc71412 100644 --- a/fipvlan.c +++ b/fipvlan.c @@ -792,6 +792,8 @@ static void recv_loop(int timeout) break; } } + if (i < pfd_len) + break; } } -- 1.8.1.4 ++++++ 0027-man-Fix-typo-in-fcoemon-documentation.patch ++++++ >From 4982e604dab3f350f3a3ca20b3c001f8ee66fdc2 Mon Sep 17 00:00:00 2001 From: Robert Love <robert.w.love(a)intel.com> Date: Sat, 25 Jan 2014 03:10:21 +0000 Subject: man: Fix typo in fcoemon documentation "module" was misspelled "modlue." This patch fixes it. Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- doc/fcoemon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt index 09ee5a2..7ccf892 100644 --- a/doc/fcoemon.txt +++ b/doc/fcoemon.txt @@ -56,7 +56,7 @@ OPTIONS *-d*, *--debug*:: Enable debugging messages. *-l*, *--legacy*:: - Force fcoemon to use the legacy /sys/modlue/libfcoe/parameters/ + Force fcoemon to use the legacy /sys/module/libfcoe/parameters/ interface. The default is to use the newer /sys/bus/fcoe/ interfaces if they are available. *-s*, *--syslog*:: -- 1.8.1.4 ++++++ 0025-systemctl-cannot-start-fcoemon.socket.patch -> 0028-systemctl-cannot-start-fcoemon.socket.patch ++++++ --- /work/SRC/openSUSE:Factory/fcoe-utils/0025-systemctl-cannot-start-fcoemon.socket.patch 2014-04-05 14:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcoe-utils.new/0028-systemctl-cannot-start-fcoemon.socket.patch 2014-04-23 17:28:15.000000000 +0200 @@ -1,4 +1,4 @@ -From 913faf7761a8fb004d44b5515b14efb0f60e9fa9 Mon Sep 17 00:00:00 2001 +From 444f3c66ee5a2b59a563d78cb70db7da2326d446 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Fri, 21 Mar 2014 14:46:40 +0100 Subject: systemctl cannot start fcoemon.socket ++++++ 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch ++++++ >From 5216ae2ef4434d92ff3d49c4d5a7b73b438aee2d Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Fri, 11 Apr 2014 15:38:26 +0200 Subject: fcoemon: Correctly handle options in the service file When runnig under systemd we can't really modify the arguments to provide an 'FCOEMON_OPTS' variable. Instead we should be modifying fcoemon --debug and --syslog to accept 'yes' or 'no' as parameters; that way we can use the variables directly. References: bnc#872732 Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- doc/fcoemon.txt | 6 +++--- etc/systemd/fcoe.service | 4 ++-- fcoemon.c | 24 +++++++++++++++--------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt index 7ccf892..7449601 100644 --- a/doc/fcoemon.txt +++ b/doc/fcoemon.txt @@ -53,13 +53,13 @@ OPTIONS ------- *-f*, *--foreground*:: Run *fcoemon* in the foreground. -*-d*, *--debug*:: - Enable debugging messages. +*-d*, *--debug=yes|no*:: + Enable or disable debugging messages. *-l*, *--legacy*:: Force fcoemon to use the legacy /sys/module/libfcoe/parameters/ interface. The default is to use the newer /sys/bus/fcoe/ interfaces if they are available. -*-s*, *--syslog*:: +*-s*, *--syslog=yes|no*:: Use syslogd for logging. The default behavior is to log to stdout and stderr. *-h*, *--help*:: diff --git a/etc/systemd/fcoe.service b/etc/systemd/fcoe.service index 5e5c8a2..2e10bcd 100644 --- a/etc/systemd/fcoe.service +++ b/etc/systemd/fcoe.service @@ -4,9 +4,9 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/sysconfig/fcoe +EnvironmentFile=/etc/fcoe/config ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS -ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS +ExecStart=/usr/sbin/fcoemon --debug=$DEBUG --syslog=$SYSLOG [Install] WantedBy=multi-user.target diff --git a/fcoemon.c b/fcoemon.c index 5e4f8d7..23fc2f6 100644 --- a/fcoemon.c +++ b/fcoemon.c @@ -336,9 +336,9 @@ static int fcoe_vid_from_ifname(const char *ifname); * Table for getopt_long(3). */ static struct option fcm_options[] = { - {"debug", 0, NULL, 'd'}, + {"debug", 1, NULL, 'd'}, {"legacy", 0, NULL, 'l'}, - {"syslog", 0, NULL, 's'}, + {"syslog", 1, NULL, 's'}, {"exec", 1, NULL, 'e'}, {"foreground", 0, NULL, 'f'}, {"version", 0, NULL, 'v'}, @@ -3192,9 +3192,9 @@ static void fcm_usage(void) { printf("Usage: %s\n" "\t [-f|--foreground]\n" - "\t [-d|--debug]\n" + "\t [-d|--debug=yes|no]\n" "\t [-l|--legacy]\n" - "\t [-s|--syslog]\n" + "\t [-s|--syslog=yes|no]\n" "\t [-v|--version]\n" "\t [-h|--help]\n\n", progname); exit(1); @@ -3648,22 +3648,28 @@ int main(int argc, char **argv) sa_log_flags = 0; openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON); - while ((c = getopt_long(argc, argv, "fdhlsv", + while ((c = getopt_long(argc, argv, "fd:hls:v", fcm_options, NULL)) != -1) { switch (c) { case 'f': fcm_fg = 1; break; case 'd': - fcoe_config.debug = 1; - enable_debug_log(1); + if (!strncmp(optarg, "yes", 3) || + !strncmp(optarg, "YES", 3)) { + fcoe_config.debug = 1; + enable_debug_log(1); + } break; case 'l': force_legacy = true; break; case 's': - fcoe_config.use_syslog = 1; - enable_syslog(1); + if (!strncmp(optarg, "yes", 3) || + !strncmp(optarg, "YES", 3)) { + fcoe_config.use_syslog = 1; + enable_syslog(1); + } break; case 'v': printf("%s\n", FCOE_UTILS_VERSION); -- 1.8.1.4 ++++++ fcoe.config ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,5 +1,5 @@ # All supported drivers listed here are loaded when service starts -SUPPORTED_DRIVERS="libfc fcoe" +SUPPORTED_DRIVERS="libfc fcoe bnx2fc" # Add --debug to enable debug messages FCOEMON_OPTS="--syslog" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nfs-utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2014-04-23 17:28:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nfs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-03-20 06:53:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-04-23 17:28:14.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 16 15:24:27 UTC 2014 - trenn(a)suse.de + +- Remove mkinitrd bits -> we use dracut now which already has + nfs stuff provided in its package in: + /usr/lib/dracut/modules.d/95nfs/ + Remove sources: + - mkinitrd-boot.sh + - mkinitrd-setup.sh + +------------------------------------------------------------------- Old: ---- mkinitrd-boot.sh mkinitrd-setup.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.EcjEUA/_old 2014-04-23 17:28:15.000000000 +0200 +++ /var/tmp/diff_new_pack.EcjEUA/_new 2014-04-23 17:28:15.000000000 +0200 @@ -16,6 +16,7 @@ # + Name: nfs-utils BuildRequires: device-mapper-devel BuildRequires: e2fsprogs-devel @@ -58,8 +59,6 @@ Source6: README.NFSv4 Source7: fw-client Source8: fw-server -Source9: mkinitrd-setup.sh -Source10: mkinitrd-boot.sh Source11: idmapd.conf Source12: start-statd Source13: nfs-utils.rpmlintrc @@ -203,9 +202,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh -install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf # @@ -232,7 +228,6 @@ mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{fillup_and_insserv -n nfs nfs} # %set_permissions /sbin/mount.nfs @@ -244,7 +239,6 @@ %postun -n nfs-client %restart_on_update nfs -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %insserv_cleanup %service_del_postun nfs @@ -281,10 +275,6 @@ %config /etc/init.d/nfs %config /etc/idmapd.conf %config /etc/nfsmount.conf -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/setup-nfs.sh -/lib/mkinitrd/scripts/boot-nfs.sh %verify(not mode) %attr(0755,root,root) /sbin/mount.nfs /sbin/mount.nfs4 /sbin/umount.nfs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tk for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package tk for openSUSE:Factory checked in at 2014-04-23 17:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tk (Old) and /work/SRC/openSUSE:Factory/.tk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tk" Changes: -------- --- /work/SRC/openSUSE:Factory/tk/tk.changes 2013-10-23 10:15:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tk.new/tk.changes 2014-04-23 17:28:12.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 31 02:35:59 UTC 2014 - badshah400(a)gmail.com + +- Add tk-fix-pkgconfig-file.patch to fix undefined linker flag + (@TK_LIBS@) in tk.pc pkgconfig file; patch sent upstream, see + https://core.tcl.tk/tcl/tktview?name=5bcb5026ad51abb7 . + +------------------------------------------------------------------- New: ---- tk-fix-pkgconfig-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tk.spec ++++++ --- /var/tmp/diff_new_pack.ve4eCZ/_old 2014-04-23 17:28:13.000000000 +0200 +++ /var/tmp/diff_new_pack.ve4eCZ/_new 2014-04-23 17:28:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tk # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,6 +52,8 @@ Source3: http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl Patch0: %name.patch Patch1: tk-8.5.12-fix-xft.patch +# PATCH-FIX-UPSTREAM tk-fix-pkgconfig-file.patch badshah400(a)gmail.com -- Fix undefined token (@TK_LIBS@) in linker flag in pkgconfig file; patch sent upstream +Patch2: tk-fix-pkgconfig-file.patch %description Tk is a graphical user interface toolkit that takes developing desktop @@ -99,6 +101,7 @@ %setup -q -n %name%version %patch0 %patch1 -p1 +%patch2 -p1 %build cd unix ++++++ tk-fix-pkgconfig-file.patch ++++++ https://core.tcl.tk/tcl/tktview?name=5bcb5026ad51abb7 Index: tk8.6.1/unix/tk.pc.in =================================================================== --- tk8.6.1.orig/unix/tk.pc.in +++ tk8.6.1/unix/tk.pc.in @@ -11,5 +11,5 @@ URL: http://www.tcl.tk/ Version: @TK_VERSION@ Requires: Conflicts: -Libs: -L${libdir} @TK_LIBS@ +Libs: -L${libdir} @TK_LIB_FLAG@ Cflags: -I${includedir} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-numpy for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2014-04-23 17:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numpy (Old) and /work/SRC/openSUSE:Factory/.python-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy-doc.changes 2014-02-04 22:46:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy-doc.changes 2014-04-23 17:28:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:24:31 UTC 2014 - arun(a)gmx.de + +- bugfix release 1.8.1 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy.changes 2013-12-08 19:46:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy.changes 2014-04-23 17:28:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:23:39 UTC 2014 - arun(a)gmx.de + +- bugfix release 1.8.1 + +------------------------------------------------------------------- Old: ---- numpy-1.8.0.tar.gz New: ---- numpy-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.UKOJQu/_old 2014-04-23 17:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UKOJQu/_new 2014-04-23 17:28:10.000000000 +0200 @@ -19,7 +19,7 @@ %define modname numpy Name: python-%{modname}-doc %define docname numpydoc -Version: 1.8.0 +Version: 1.8.1 Release: 0 %define docvers 0.4 Url: http://sourceforge.net/projects/numpy ++++++ python-numpy.spec ++++++ --- /var/tmp/diff_new_pack.UKOJQu/_old 2014-04-23 17:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UKOJQu/_new 2014-04-23 17:28:10.000000000 +0200 @@ -20,7 +20,7 @@ %define modname numpy Name: python-%{modname} -Version: 1.8.0 +Version: 1.8.1 Release: 0 Url: http://sourceforge.net/projects/numpy Summary: NumPy array processing for numbers, strings, records and objects ++++++ numpy-1.8.0.tar.gz -> numpy-1.8.1.tar.gz ++++++ ++++ 31958 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vdr for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2014-04-22 17:09:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vdr" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2013-03-05 16:34:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2014-04-22 17:09:22.000000000 +0200 @@ -1,0 +2,92 @@ +Tue Apr 22 10:38:57 UTC 2014 - seife+obs(a)b1-systems.com + +- remove support for ancient distributions +- list of patches which fix stuff: + vdr-1.7.21-pluginmissing.patch - don't die on missing plugin + vdr-1.7.29-menuselection.patch + vdr-1.7.36-wareagle.patch - wareagle icons + vdr-2.0.6-wareagle-fix.patch + vdr-2.0.3-dynamite.patch - allow the dynamite plugin + vdr-2.0.4-MainMenuHooks-v1_0_1.patch + +------------------------------------------------------------------- +Thu Apr 10 21:40:38 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: remove vdr_old_plugin_* and vdr_install_plugin_*, + all current users are converted now + +------------------------------------------------------------------- +Sun Apr 6 21:57:34 UTC 2014 - seife+obs(a)b1-systems.com + +- fix broken record filenames in e.g. streamdev, bug in wareagle + patch (vdr-2.0.6-wareagle-fix.patch) + +------------------------------------------------------------------- +Wed Apr 2 16:19:07 UTC 2014 - seife+obs(a)b1-systems.com + +- small fix for classic runvdr init script +- recommend instead of suggest runvdr-extreme on >=12.1, vdr-runvdr + on < 12.2 + +------------------------------------------------------------------- +Sun Mar 30 18:31:26 UTC 2014 - seife+obs(a)b1-systems.com + +- fix build on SLES11 +- remove unused vdr_old_dvbapi.diff and Make.config + +------------------------------------------------------------------- +Sun Mar 30 16:34:31 UTC 2014 - seife+obs(a)b1-systems.com + +- split off init script into vdr-runvdr package + It is recommended to use runvdr-extreme-systemd instead + +------------------------------------------------------------------- +Sun Mar 30 12:05:23 UTC 2014 - seife+obs(a)b1-systems.com + +- avoid putting build time into locale files, causing republishing +- install msgmerge wrapper to /usr/share/vdr to make it usable + by plugins + +------------------------------------------------------------------- +Sun Mar 30 02:02:25 UTC 2014 - seife+obs(a)b1-systems.com + +- update to vdr 2.0.6 + - see HISTORY file for changes + - vdrapi version bumped to 2.0.6 + +------------------------------------------------------------------- +Sat Mar 29 20:12:03 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: allow empty srcdir in vdr_old_plugin_make + +------------------------------------------------------------------- +Sat Mar 29 19:07:25 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: set vdr_includedir back to /usr/include/vdr + +------------------------------------------------------------------- +Sat Mar 29 16:32:55 UTC 2014 - seife+obs(a)b1-systems.com + +- remove plugin build macros + +------------------------------------------------------------------- +Sun Jan 12 12:02:45 UTC 2014 - wagner-thomas(a)gmx.at + +- Update to vdr 2.0.5 + +------------------------------------------------------------------- +Tue Nov 26 16:06:50 UTC 2013 - hpj(a)urpla.net + +- Update to vdr 2.0.4 + +------------------------------------------------------------------- +Tue Jun 4 21:33:54 UTC 2013 - hpj(a)urpla.net + +- Adjust vdr macros + +------------------------------------------------------------------- +Tue Jun 4 21:12:42 UTC 2013 - hpj(a)urpla.net + +- Update to vdr 2.0.2 + +------------------------------------------------------------------- Old: ---- channels.conf vdr-1.6.0-1.diff vdr-1.6.0-2.diff vdr-1.6.0-bnc786040-use-v4l2.patch vdr-1.6.0-const.diff vdr-1.6.0-gcc46.patch vdr-1.6.0-kernel-2.6.29.diff vdr-1.6.0-ncurses.diff vdr-1.6.0.tar.bz2 vdr-FcFontSort-72c5ec3.diff vdr-gcc47.patch New: ---- msgmerge vdr-1.7.21-pluginmissing.patch vdr-1.7.29-menuselection.patch vdr-1.7.36-wareagle.patch vdr-2.0.3-dynamite.patch vdr-2.0.4-MainMenuHooks-v1_0_1.patch vdr-2.0.6-wareagle-fix.patch vdr-2.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vdr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,29 @@ Name: vdr +BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: graphviz +BuildRequires: libcap-devel BuildRequires: libjpeg-devel +BuildRequires: linux-glibc-devel BuildRequires: ncurses-devel -%if %suse_version > 1000 -BuildRequires: libcap-devel -%else -BuildRequires: libcap -%endif +BuildRequires: pkg-config # %define vdrname vdr -%define vdr_apiversion 1.6.0 +%define vdr_apiversion 2.0.6 %define vdr_localedir %{_datadir}/vdr/locale -%define vdr_libdir %{_libdir}/vdr/ +%define vdr_libdir %{_libdir}/vdr %define vdr_includedir %{_includedir}/vdr %define vdr_videodir /var/spool/video %define vdr_sysconfdir /etc/vdr # Url: http://www.tvdr.de/ -PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq -Version: 1.6.0 +PreReq: /usr/sbin/useradd +Version: 2.0.6 Release: 0 Summary: Video Disk Recorder License: GPL-2.0+ @@ -48,12 +49,11 @@ Source2: sysconfig.vdr Source3: vdr-shutdown.sh Source4: runvdr -#Source5: README.SuSE-vdr +Source5: remote.conf Source6: openvt.diff Source7: vdr-genindex.c -Source8: channels.conf -Source9: remote.conf Source10: vdr.macros +Source42: msgmerge # generated from wiki page Source90: README.SuSE-vdr.txt Source91: README.SuSE-vdr.html @@ -61,24 +61,25 @@ Source93: vdr-fetchwikipage Source94: vdr-renderwikipage Source95: vdr-doc.desktop -Patch0: ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff -Patch1: ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff -Patch20: vdr-1.6.0-ncurses.diff -Patch21: vdr-1.6.0-kernel-2.6.29.diff -Patch22: vdr-1.6.0-const.diff -# PATCH-FIX-UPSTREAM vdr-1.6.0-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 -Patch23: vdr-1.6.0-gcc46.patch -# PATCH-FIX-UPSTREAM vdr-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7. -Patch25: vdr-gcc47.patch -# UPSTREAM 72c5ec3 to make it work with fontconfig-2.9 -Patch26: vdr-FcFontSort-72c5ec3.diff -# PATCH-FIX-Upstream vdr-1.6.0-bnc786040-use-v4l2.patch seife(a)novel.slipkontur.de -- use v4l2. -Patch27: vdr-1.6.0-bnc786040-use-v4l2.patch +# +Patch1: vdr-1.7.29-menuselection.patch +Patch2: vdr-1.7.21-pluginmissing.patch +Patch3: vdr-1.7.36-wareagle.patch +Patch4: vdr-2.0.3-dynamite.patch +Patch5: vdr-2.0.4-MainMenuHooks-v1_0_1.patch +Patch6: vdr-2.0.6-wareagle-fix.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: vdr-devel Provides: vdr(abi) = %vdr_apiversion +Obsoletes: vdr(abi) < %vdr_apiversion +Provides: vdrapi = %vdr_apiversion Requires: xorg-x11-fonts-scalable -Recommends: vdr-plugins dvb +%if 0%{?suse_version} >= 1220 +Recommends: runvdr-extreme-systemd +%else +Recommends: vdr-runvdr +%endif %package devel Summary: Video Disk Recorder @@ -86,86 +87,52 @@ PreReq: vdr = %version %description -Video Disk Recorder (VDR) is a digital satellite (DVB) receiver -program. It can record MPEG2 streams, as well as output the stream to -TV. - - - -Authors: --------- - Klaus Schmidinger <Klaus.Schmidinger(a)tvdr.de> - Carsten Koch <Carsten.Koch(a)icem.de> - Plamen Ganev <pganev(a)com-it.net> - Heino Goldenstein <heino.goldenstein(a)microplex.de> - Guido Fiala <gfiala(a)s.netic.de> - Robert Schneider <Robert.Schneider(a)lotus.com> - Niels de Carpentier <niels(a)casema.net> - Martin Hammerschmid <martin(a)hammerschmid.com> - Bastian Guse <bastian(a)nocopy.de> - Matthias Schniedermeyer <ms(a)citd.de> - Miha Setina <mihasetina(a)softhome.net> - Alberto Carraro <bertocar(a)tin.it> - Deti Fliegl <deti(a)fliegl.de> - Dave Chapman <dave(a)dchapman.com> - Hans-Peter Raschke <Hans-Peter.Raschke(a)Wintermann-DatenService.de> - Peter Hofmann <software(a)pxh.de> - Axel Gruber <axel(a)agm.de> - Arnold Niessen <niessen(a)iae.nl> <arnold.niessen(a)philips.com> - Jürgen Sauer <jojo(a)automatix.de> - Benjamin Reichardt <reichard(a)math.uni-goettingen.de> - Henning Holtschneider <hh(a)holtschneider.com> +Version 2.0 of VDR, the Linux Video Disk Recorder provides HDTV support, the +Transport Stream recording format, DVB subtitles, ATSC support, and improved +Electronic Program Guides handling. %description devel -Video Disk Recorder (VDR) is a digital satellite (DVB) receiver -program. It can record MPEG2 streams, as well as output the stream to -TV. - +Development files for VDR, needed for building plugins, including API documentation. +%package runvdr +Summary: Init script for VDR +Group: Hardware/TV +PreReq: vdr = %version +PreReq: %fillup_prereq %insserv_prereq -Authors: --------- - Klaus Schmidinger <Klaus.Schmidinger(a)tvdr.de> - Carsten Koch <Carsten.Koch(a)icem.de> - Plamen Ganev <pganev(a)com-it.net> - Heino Goldenstein <heino.goldenstein(a)microplex.de> - Guido Fiala <gfiala(a)s.netic.de> - Robert Schneider <Robert.Schneider(a)lotus.com> - Niels de Carpentier <niels(a)casema.net> - Martin Hammerschmid <martin(a)hammerschmid.com> - Bastian Guse <bastian(a)nocopy.de> - Matthias Schniedermeyer <ms(a)citd.de> - Miha Setina <mihasetina(a)softhome.net> - Alberto Carraro <bertocar(a)tin.it> - Deti Fliegl <deti(a)fliegl.de> - Dave Chapman <dave(a)dchapman.com> - Hans-Peter Raschke <Hans-Peter.Raschke(a)Wintermann-DatenService.de> - Peter Hofmann <software(a)pxh.de> - Axel Gruber <axel(a)agm.de> - Arnold Niessen <niessen(a)iae.nl> <arnold.niessen(a)philips.com> - Jürgen Sauer <jojo(a)automatix.de> - Benjamin Reichardt <reichard(a)math.uni-goettingen.de> - Henning Holtschneider <hh(a)holtschneider.com> +%description runvdr +The "classic" SUSE start script for VDR. Not recommended, use runvdr-extreme-systemd instead. %prep %setup -q -n vdr-%{version} -cp %{SOURCE1} . -cp %{SOURCE2} . -cp %{SOURCE4} . +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +# +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 # cat > Make.config <<EOF ### The C compiler options: CFLAGS = $RPM_OPT_FLAGS -fPIC -Wall -CXXFLAGS = -fPIC $RPM_OPT_FLAGS -Wall -Woverloaded-virtual +CXXFLAGS = $RPM_OPT_FLAGS -fPIC -Wall -Werror=overloaded-virtual -Wparentheses ### The directory environment: -MANDIR = %{_mandir} +PREFIX = %{_prefix} BINDIR = %{_bindir} +INCDIR = %{_includedir} +LIBDIR = %{vdr_libdir} LOCDIR = %{vdr_localedir} +MANDIR = %{_mandir} +PCDIR = %{_libdir}/pkgconfig +RESDIR = %{_datadir}/vdr + VIDEODIR = %{vdr_videodir} -REMOTE = LIRC -PLUGINLIBDIR = %{vdr_libdir} +CONFDIR = %{vdr_sysconfdir} +CACHEDIR = %{_localstatedir}/cache/vdr +LIRC_DEVICE = /var/run/lirc/lircd VDR_USER = vdr -WITH_CAPABILITIES = 1 EOF # APIVERSION=`sed -ne '/define APIVERSION/s/^.*"$.*$".*$/\1/p' config.h` @@ -173,67 +140,45 @@ echo "*** APIVERSION must be $APIVERSION, fix definition!" false fi -%patch0 -p1 -%patch1 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 +# for some reason, graphviz doesn't like png here +sed -i 's|^$DOT_IMAGE_FORMAT\s\+= $.*$|\1svg|g + s|^$INTERACTIVE_SVG\s\+= $.*$|\1YES|g' Doxyfile +# do not include build date in locale files +cp -a %{SOURCE42} . +chmod 0755 msgmerge %build -#cp %{SOURCE5} README.SuSE -cp %{SOURCE6} . -cp %{SOURCE7} . +# to use msgmerge script +export PATH=`pwd`:$PATH make %{?jobs:-j%jobs} make plugins +make srcdoc gcc -o vdr-genindex %{optflags} -funroll-loops vdr-genindex.c %install -install -d -m 755 %{buildroot}%{_mandir}/man{1,5} -install -d -m 755 %{buildroot}%{_sbindir} -install -d -m 755 %{buildroot}%{_bindir} -install -d -m 755 %{buildroot}%{vdr_sysconfdir} -install -d -m 755 %{buildroot}%{vdr_sysconfdir}/plugins -install -d -m 755 %{buildroot}%{vdr_videodir} -install -d -m 755 %{buildroot}%{vdr_libdir} -install -d -m 755 %{buildroot}%{vdr_includedir} -install -d -m 755 %{buildroot}%{vdr_includedir}/libsi -make MANDIR=%{buildroot}%{_mandir} \ - BINDIR=%{buildroot}%{_sbindir} \ - VIDEODIR=%{buildroot}%{vdr_videodir} \ - PLUGINLIBDIR=%{buildroot}%{vdr_libdir} \ - LOCDIR=%{buildroot}%{vdr_localedir} \ - install -# +%makeinstall install -m 644 *.conf %{buildroot}%{vdr_sysconfdir} -for i in epg2html.pl svdrpsend.pl PLUGINS/src/sky/getskyepg.pl; do - install -m 755 $i %{buildroot}%{_bindir}/${i##*/} -done -install -m 644 *.h %{buildroot}%{vdr_includedir} -install -m 644 libsi/*.h %{buildroot}%{vdr_includedir}/libsi install -m 644 Make.config %{buildroot}%{vdr_includedir} -ln -s . %{buildroot}%{vdr_includedir}/vdr -ln -s . %{buildroot}%{vdr_includedir}/include -install -m 755 PLUGINS/lib/* %{buildroot}%{vdr_libdir}/ -install -m 755 %{SOURCE3} %{buildroot}%{vdr_sysconfdir}/shutdown.sh -#sysconfig&init +install -m 755 vdr-shutdown.sh %{buildroot}%{vdr_sysconfdir}/shutdown.sh +install -d -m 755 %{buildroot}%{_localstatedir}/cache/vdr +# sysconfig&init for vdr-runvdr install -d -m 755 %{buildroot}/var/adm/fillup-templates install -m 644 sysconfig.vdr %{buildroot}/var/adm/fillup-templates/sysconfig.vdr install -d -m 755 %{buildroot}/etc/init.d +install -d -m 755 %{buildroot}%{_sbindir} install -m 755 rcvdr %{buildroot}/etc/init.d/vdr -ln -s ../../etc/init.d/vdr %{buildroot}%{_sbindir}/rcvdr +# ln -s ../../etc/init.d/vdr %%{buildroot}%%{_sbindir}/rcvdr +ln -s service %{buildroot}%{_sbindir}/rcvdr # create plugins doc dir mkdir plugins -cp -a PLUGINS/src/sky/channels.conf.sky PLUGINS/src/sky/lircd.conf.sky plugins -cp -a PLUGINS/src/sky/README plugins/README.sky -cp -a PLUGINS/src/osddemo/README plugins/README.osddemo -rm %{buildroot}%{_sbindir}/runvdr +for d in PLUGINS/src; do + test -d PLUGINS/src/$d && { + for f in README HISTORY COPYING; do + test -f PLUGINS/src/$d/$f && cp -a PLUGINS/src/$d/$f plugins/$f.$d + done + } +done install -m 755 runvdr %{buildroot}%{_sbindir}/runvdr -install -m 644 %{SOURCE8} %{buildroot}%{vdr_sysconfdir}/channels.conf -install -m 644 %{SOURCE9} %{buildroot}%{vdr_sysconfdir}/remote.conf install -m 755 vdr-genindex %{buildroot}%{_bindir} # # docu @@ -250,6 +195,11 @@ echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" done >> vdr.lang # +# source code docu (installed manually for the sake of fdupes' success) +install -d -m 755 %{buildroot}%{_docdir}/%{name}-devel +cp -a srcdoc/html %{buildroot}%{_docdir}/%{name}-devel +%fdupes %{buildroot}%{_docdir}/%{name}-devel +# # rpm macro file install -d -m 755 %{buildroot}/etc/rpm cat > %{buildroot}/etc/rpm/macros.vdr <<EOF @@ -263,6 +213,9 @@ %%vdr_prereq vdr(abi) = %{vdr_apiversion} EOF cat %{SOURCE10} >> %{buildroot}/etc/rpm/macros.vdr +# +# msgmerge helper for plugins +install -m 0755 msgmerge %{buildroot}%{_datadir}/vdr/msgmerge %clean rm -rf $RPM_BUILD_ROOT @@ -270,41 +223,49 @@ %pre /usr/sbin/useradd -r -d %{vdr_videodir} -s /bin/false -c "Video Disk Recorder" -g video vdr 2> /dev/null || : -%post +%post runvdr %{fillup_and_insserv vdr} -%postun +%postun runvdr %{insserv_cleanup} -%preun +%preun runvdr %stop_on_removal %files -f vdr.lang %defattr(-,root,root) %doc README.SuSE README.SuSE.html greenish.css %doc %{_datadir}/susehelp -%doc COPYING INSTALL README CONTRIBUTORS HISTORY +%doc COPYING INSTALL README* UPDATE* CONTRIBUTORS HISTORY %doc MANUAL channels.conf.* PLUGINS.html plugins %doc openvt.diff %attr(755,vdr,root) %dir %{vdr_videodir} %attr(755,vdr,root) %dir %{vdr_sysconfdir} +%attr(755,vdr,root) %dir %{_localstatedir}/cache/vdr %dir %{vdr_libdir} %dir %{_datadir}/vdr %dir %{vdr_localedir} %dir %{vdr_localedir}/* %dir %{vdr_localedir}/*/LC_MESSAGES %attr(-,vdr,root) %config(noreplace) %{vdr_sysconfdir}/* -%{_sbindir}/* %{_bindir}/* +%{_sbindir}/rcvdr %{vdr_libdir}/* %{_mandir}/man?/* -/etc/init.d/* -/var/adm/fillup-templates/* %files devel %defattr(-,root,root) %config /etc/rpm/macros.vdr -%dir %{vdr_includedir} -%{vdr_includedir}/* +%{vdr_includedir} +%{_includedir}/libsi +%{_libdir}/pkgconfig/* +%{_docdir}/%{name}-devel +%{_datadir}/vdr/msgmerge + +%files runvdr +%defattr(-,root,root) +/etc/init.d/* +%{_sbindir}/runvdr +/var/adm/fillup-templates/* %changelog ++++++ README.SuSE-vdr.html ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -33,7 +33,7 @@ Astra-19.2E (DVB-S). You can create you own using dvbscan. For example if you live in Nuernberg, Germany and want to create a channels.conf for DVB-T you would run</p> -<pre> dvbscan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf +<pre> scan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf </pre> <a name='Using%20vdr%20with%20a%20TV%20set%20attached'></a><h2>Using vdr with a TV set attached</h2> @@ -84,4 +84,4 @@ <p>Packages for the most recent stable vdr version are available via the <a href='http://download.opensuse.org/repositories/vdr/'>openSUSE build service</a></p> -</html></body> \ No newline at end of file +</html></body> ++++++ README.SuSE-vdr.txt ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -14,8 +14,8 @@ • /var/spool/video is the place where recordings are stored. If you are low on space you should consider putting this on a separate partition. Recordings can take up several Gigabytes. - • /usr/lib/vdr contains shared libraries for plugins. If you compile you own - plugins you need to put them there. + • /usr/{lib,lib64}/vdr contains shared libraries for plugins. If you compile + you own plugins you need to put them there. • /usr/include/vdr contains header files necessary to compile plugins. Start scripts @@ -36,7 +36,7 @@ live in Nuernberg, Germany and want to create a channels.conf for DVB-T you would run - dvbscan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf + scan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf Using vdr with a TV set attached ++++++ msgmerge ++++++ #!/bin/bash # wrapper script for msgmerge to avoid changed POT-Creation-Date: # on every rebuild. # (C) 2014 Stefan Seyfried, License: WTFPL v2 # # msgmerge is called like that in vdr makefiles # msgmerge -U --no-wrap --no-location --backup=none -q -N po/lt_LT.po po/skincurses.pot ARGS="$@" NUM=$# shift $((NUM - 2)) IN="$1" CREATE=$(grep ^\"POT-Creation-Date: "$IN") CREATE=${CREATE//\\/\\\\} # double the backslashes... /usr/bin/msgmerge $ARGS RET=$? sed -i -e s#^.POT-Creation-Date:.*#"$CREATE"# "$IN" exit $RET ++++++ rcvdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -19,7 +19,7 @@ ### END INIT INFO # Check for missing binaries (stale symlinks should not happen) -VDR_BIN=/usr/sbin/vdr +VDR_BIN=/usr/bin/vdr test -x $VDR_BIN || exit 5 # Check for existence of needed config file and read it @@ -82,10 +82,16 @@ rm -f /var/run/runvdr_exit /bin/openvt -c "$VDR_VTNUMBER" $doswitch /usr/sbin/runvdr - sleep 1 && checkproc $VDR_BIN - - # Remember status and be verbose - rc_status -v + # especially during system startup, it can take quite some time until vdr is running + for i in 1 2 3 4 5 6 7 8 9 10; do + sleep 1 + checkproc $VDR_BIN + RET=$? + rc_status + if [ $RET = 0 ]; then + break + fi + done ;; stop) echo -n "Shutting down Video Disk Recorder " ++++++ runvdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -10,7 +10,7 @@ # # $Id: runvdr 1.11 2003/08/26 16:15:41 kls Exp $ -VDR_BIN="/usr/sbin/vdr" +VDR_BIN="/usr/bin/vdr" rcdvb="/usr/sbin/rcdvb" cd # go home ++++++ sysconfig.vdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -1,3 +1,8 @@ +################################################################ +###### Attention: This is only used by vdr-runvdr package ###### +### runvdr-extreme-systemd is configured in /etc/runvdr.conf ### +################################################################ + ## Path: Applications/VDR ## Description: VDR digital video recorder configuration ## ServiceRestart: vdr ++++++ vdr-1.7.21-pluginmissing.patch ++++++ diff -ruN vdr-1.7.20/plugin.c vdr-1.7.20.patched//plugin.c --- vdr-1.7.20/plugin.c 2010-01-06 12:36:46.000000000 +0100 +++ vdr-1.7.20.patched//plugin.c 2011-08-16 23:48:20.264919835 +0200 @@ -317,6 +317,12 @@ char *p = strchr(s, ' '); if (p) *p = 0; + struct stat st; + if (stat (cString::sprintf("%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION), &st) && errno == ENOENT) { + esyslog("WARN: missing plugin '%s'", s); + fprintf(stderr, "vdr: missing plugin '%s'\n", s); + } + else dlls.Add(new cDll(cString::sprintf("%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION), Args)); free(s); } @@ -325,7 +331,7 @@ { for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) { if (!dll->Load(Log)) - return false; + ; } return true; } ++++++ vdr-1.7.29-menuselection.patch ++++++ diff -Nru vdr-1.7.29-vanilla/osdbase.c vdr-1.7.29-menuselection/osdbase.c --- vdr-1.7.29-vanilla/osdbase.c 2012-07-17 22:37:09.000000000 +0300 +++ vdr-1.7.29-menuselection/osdbase.c 2012-07-17 22:44:15.000000000 +0300 @@ -77,6 +77,7 @@ { isMenu = true; digit = 0; + key_nr = -1; hasHotkeys = false; displayMenuItems = 0; title = NULL; @@ -126,7 +127,7 @@ digit = -1; // prevents automatic hotkeys - input already has them if (digit >= 0) { digit++; - buffer = cString::sprintf(" %c %s", (digit < 10) ? '0' + digit : ' ' , s); + buffer = cString::sprintf(" %2d%s %s", digit, (digit > 9) ? "" : " ", s); s = buffer; } } @@ -472,20 +473,60 @@ } } +#define MENUKEY_TIMEOUT 1500 + eOSState cOsdMenu::HotKey(eKeys Key) { - for (cOsdItem *item = First(); item; item = Next(item)) { + bool match = false; + bool highlight = false; + int item_nr; + int i; + + if (Key == kNone) { + if (lastActivity.TimedOut()) + Key = kOk; + else + return osContinue; + } + else + lastActivity.Set(MENUKEY_TIMEOUT); + for (cOsdItem *item = Last(); item; item = Prev(item)) { const char *s = item->Text(); - if (s && (s = skipspace(s)) != NULL) { - if (*s == Key - k1 + '1') { + i = 0; + item_nr = 0; + if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { + do { + item_nr = item_nr * 10 + (s[i] - '0'); + } + while ( !((s[++i] == '\t')||(s[i] == ' ')) && (s[i] != '\0') && ('0' <= s[i]) && (s[i] <= '9')); + if ((Key == kOk) && (item_nr == key_nr)) { current = item->Index(); RefreshCurrent(); Display(); cRemote::Put(kOk, true); + key_nr = -1; break; } + else if (Key != kOk) { + if (!highlight && (item_nr == (Key - k0))) { + highlight = true; + current = item->Index(); + } + if (!match && (key_nr == -1) && ((item_nr / 10) == (Key - k0))) { + match = true; + key_nr = (Key - k0); + } + else if (((key_nr == -1) && (item_nr == (Key - k0))) || (!match && (key_nr >= 0) && (item_nr == (10 * key_nr + Key - k0)))) { + current = item->Index(); + cRemote::Put(kOk, true); + key_nr = -1; + break; + } + } } } + if ((!match) && (Key != kNone)) + key_nr = -1; return osContinue; } @@ -524,8 +565,8 @@ } } switch (int(Key)) { - case k0: return osUnknown; - case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown; + case kNone: + case k0...k9: return hasHotkeys ? HotKey(Key) : osUnknown; case kUp|k_Repeat: case kUp: CursorUp(); break; case kDown|k_Repeat: diff -Nru vdr-1.7.29-vanilla/osdbase.h vdr-1.7.29-menuselection/osdbase.h --- vdr-1.7.29-vanilla/osdbase.h 2012-07-17 22:37:09.000000000 +0300 +++ vdr-1.7.29-menuselection/osdbase.h 2012-07-17 22:44:15.000000000 +0300 @@ -97,6 +97,8 @@ char *status; int digit; bool hasHotkeys; + int key_nr; + cTimeMs lastActivity; void DisplayHelp(bool Force = false); protected: void SetDisplayMenu(void); ++++++ vdr-1.7.36-wareagle.patch ++++++ diff -ruN vdr-1.7.36.orig/config.c vdr-1.7.36/config.c --- vdr-1.7.36.orig/config.c 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/config.c 2013-01-27 12:56:24.230017960 +0100 @@ -376,6 +376,7 @@ strcpy(OSDLanguage, ""); // default is taken from environment strcpy(OSDSkin, "lcars"); strcpy(OSDTheme, "default"); + WarEagleIcons = 1; PrimaryDVB = 1; ShowInfoOnChSwitch = 1; TimeoutRequChInfo = 1; @@ -578,6 +579,7 @@ if (!strcasecmp(Name, "OSDLanguage")) { strn0cpy(OSDLanguage, Value, sizeof(OSDLanguage)); I18nSetLocale(OSDLanguage); } else if (!strcasecmp(Name, "OSDSkin")) Utf8Strn0Cpy(OSDSkin, Value, MaxSkinName); else if (!strcasecmp(Name, "OSDTheme")) Utf8Strn0Cpy(OSDTheme, Value, MaxThemeName); + else if (!strcasecmp(Name, "WarEagleIcons")) WarEagleIcons = atoi(Value); else if (!strcasecmp(Name, "PrimaryDVB")) PrimaryDVB = atoi(Value); else if (!strcasecmp(Name, "ShowInfoOnChSwitch")) ShowInfoOnChSwitch = atoi(Value); else if (!strcasecmp(Name, "TimeoutRequChInfo")) TimeoutRequChInfo = atoi(Value); @@ -684,6 +686,7 @@ Store("OSDLanguage", OSDLanguage); Store("OSDSkin", OSDSkin); Store("OSDTheme", OSDTheme); + Store("WarEagleIcons", WarEagleIcons); Store("PrimaryDVB", PrimaryDVB); Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch); Store("TimeoutRequChInfo", TimeoutRequChInfo); diff -ruN vdr-1.7.36.orig/config.h vdr-1.7.36/config.h --- vdr-1.7.36.orig/config.h 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/config.h 2013-01-27 12:56:24.230017960 +0100 @@ -250,6 +250,7 @@ char OSDLanguage[I18N_MAX_LOCALE_LEN]; char OSDSkin[MaxSkinName]; char OSDTheme[MaxThemeName]; + int WarEagleIcons; int PrimaryDVB; int ShowInfoOnChSwitch; int TimeoutRequChInfo; diff -ruN vdr-1.7.36.orig/iconpatch.c vdr-1.7.36/iconpatch.c --- vdr-1.7.36.orig/iconpatch.c 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.7.36/iconpatch.c 2013-01-27 12:56:24.231017960 +0100 @@ -0,0 +1,27 @@ +#include "iconpatch.h" + +#include <langinfo.h> +#include <locale.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +bool IsLangUtf8(void) +{ + char *CodeSet = NULL; + if (setlocale(LC_CTYPE, "")) + CodeSet = nl_langinfo(CODESET); + else { + char *LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed + if (LangEnv) { + CodeSet = strchr(LangEnv, '.'); + if (CodeSet) + CodeSet++; // skip the dot + } + } + + if (CodeSet && strcasestr(CodeSet, "UTF-8") != 0) + return true; + + return false; +} diff -ruN vdr-1.7.36.orig/iconpatch.h vdr-1.7.36/iconpatch.h --- vdr-1.7.36.orig/iconpatch.h 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.7.36/iconpatch.h 2013-01-27 12:56:24.231017960 +0100 @@ -0,0 +1,70 @@ +/* + * iconpatch.h: Information of iconpatch + * + * Diese Datei ist die Übersichtsdatei für den Iconpatch. + * Hier werden kleine Infos abgelegt. + * Der Iconpatch ändert die Dateien: + * iconpatch.h + * menu.c + * recording.c + * fontosd.c + * + */ + +// Iconpatch-Variablen - Anfang +#define ICON_NUMBERSIGN "\x23" +#define ICON_ASTERISK "\x2A" +#define ICON_GREATER "\x3E" +#define ICON_EXCLAM "\x21" +#define ICON_PLUSMINUS "\xB1" + +#define ICON_RESUME "\x80" +#define ICON_DVD "\x81" +#define ICON_FOLDER "\x82" +#define ICON_BLANK "\x83" +#define ICON_CUTTING "\x84" +#define ICON_MOVE_FILE "\x85" +#define ICON_MOVE_FOLDER "\x86" +#define ICON_BAR_START "\x87" +#define ICON_BAR_FILLED "\x88" +#define ICON_BAR_CLEAR "\x89" +#define ICON_BAR_END "\x8A" +#define ICON_REC "\x8B" +#define ICON_CLOCK "\x8C" +#define ICON_TV_CRYPTED "\x8D" +#define ICON_RADIO "\x8E" +#define ICON_TV "\x8F" +#define ICON_NEW "\x90" +#define ICON_ARROW "\x91" +#define ICON_RUNNING "\x92" +#define ICON_VPS "\x93" +#define ICON_CLOCK_UH "\x94" +#define ICON_CLOCK_LH "\x95" + +// UTF-8 Icons +#define ICON_RESUME_UTF8 "\uE000" +#define ICON_DVD_UTF8 "\uE001" +#define ICON_FOLDER_UTF8 "\uE002" +#define ICON_BLANK_UTF8 "\uE003" +#define ICON_CUTTING_UTF8 "\uE004" +#define ICON_MOVE_FILE_UTF8 "\uE005" +#define ICON_MOVE_FOLDER_UTF8 "\uE006" +#define ICON_BAR_START_UTF8 "\uE007" +#define ICON_BAR_FILLED_UTF8 "\uE008" +#define ICON_BAR_EMPTY_UTF8 "\uE009" +#define ICON_BAR_CLOSE_UTF8 "\uE00A" +#define ICON_REC_UTF8 "\uE00B" +#define ICON_CLOCK_UTF8 "\uE00C" +#define ICON_TV_CRYPTED_UTF8 "\uE00D" +#define ICON_RADIO_UTF8 "\uE00E" +#define ICON_TV_UTF8 "\uE00F" +#define ICON_NEW_UTF8 "\uE010" +#define ICON_ARROW_UTF8 "\uE011" +#define ICON_RUNNING_UTF8 "\uE012" +#define ICON_VPS_UTF8 "\uE013" +#define ICON_CLOCK_UH_UTF8 "\uE014" +#define ICON_CLOCK_LH_UTF8 "\uE015" + +// Iconpatch-Variablen - Ende + +bool IsLangUtf8(void); diff -ruN vdr-1.7.36.orig/Makefile vdr-1.7.36/Makefile --- vdr-1.7.36.orig/Makefile 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/Makefile 2013-01-27 12:57:43.570018239 +0100 @@ -73,6 +73,8 @@ skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\ timers.o tools.o transfer.o vdr.o videodir.o +OBJS += iconpatch.o + DEFINES += $(CDEFINES) INCLUDES += $(CINCLUDES) diff -ruN vdr-1.7.36.orig/menu.c vdr-1.7.36/menu.c --- vdr-1.7.36.orig/menu.c 2013-01-27 12:54:57.741017655 +0100 +++ vdr-1.7.36/menu.c 2013-01-27 12:56:24.235017960 +0100 @@ -8,6 +8,7 @@ */ #include "menu.h" +#include "iconpatch.h" #include <ctype.h> #include <limits.h> #include <math.h> @@ -316,6 +317,14 @@ if (!channel->GroupSep()) { if (sortMode == csmProvider) buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name()); + else if (Setup.WarEagleIcons) { + if (channel->Vpid() == 1 || channel->Vpid() == 0) + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_RADIO_UTF8 : ICON_RADIO, channel->Name()); + else if (channel->Ca() == 0) + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_TV_UTF8 : ICON_TV, channel->Name()); + else + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_TV_CRYPTED_UTF8 : ICON_TV_CRYPTED, channel->Name()); + } else buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name()); } @@ -1044,8 +1053,8 @@ File++; else File = timer->File(); - SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s", - !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>', + SetText(cString::sprintf("%s\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s", + !(timer->HasFlags(tfActive)) ? " " : timer->FirstDay() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_ARROW_UTF8 : ICON_ARROW : "!" : timer->Recording() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_REC_UTF8 : ICON_REC : "#" : Setup.WarEagleIcons ? IsLangUtf8() ? ICON_CLOCK_UTF8 : ICON_CLOCK : ">", timer->Channel()->Number(), *name, *name && **name ? " " : "", @@ -1319,7 +1328,12 @@ return r; } -static const char *TimerMatchChars = " tT"; +static const char *TimerMatchChars[9] = +{ + " ", "t", "T", + ICON_BLANK, ICON_CLOCK_UH, ICON_CLOCK, + ICON_BLANK_UTF8, ICON_CLOCK_UH_UTF8, ICON_CLOCK_UTF8 +}; bool cMenuScheduleItem::Update(bool Force) { @@ -1328,17 +1342,17 @@ Timers.GetMatch(event, &timerMatch); if (Force || timerMatch != OldTimerMatch) { cString buffer; - char t = TimerMatchChars[timerMatch]; - char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' '; - char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' '; + const char *t = Setup.WarEagleIcons ? IsLangUtf8() ? TimerMatchChars[timerMatch+6] : TimerMatchChars[timerMatch+3] : TimerMatchChars[timerMatch]; + const char *v = event->Vps() && (event->Vps() - event->StartTime()) ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_VPS_UTF8 : ICON_VPS : "V" : " "; + const char *r = event->SeenWithin(30) && event->IsRunning() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_RUNNING_UTF8 : ICON_RUNNING : "*" : " "; const char *csn = channel ? channel->ShortName(true) : NULL; cString eds = event->GetDateString(); if (channel && withDate) - buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%s%s%s\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); else if (channel) - buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%d\t%.*s\t%s\t%s%s%s\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title()); else - buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%.*s\t%s\t%s%s%s\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); SetText(buffer); result = true; } @@ -2584,6 +2598,7 @@ Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"), &skinIndex, numSkins, skinDescriptions)); if (themes.NumThemes()) Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"), &themeIndex, themes.NumThemes(), themes.Descriptions())); + Add(new cMenuEditBoolItem(tr("Setup.OSD$WarEagle icons"), &data.WarEagleIcons)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Left (%)"), &data.OSDLeftP, 0.0, 0.5)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Top (%)"), &data.OSDTopP, 0.0, 0.5)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Width (%)"), &data.OSDWidthP, 0.5, 1.0)); diff -ruN vdr-1.7.36.orig/recording.c vdr-1.7.36/recording.c --- vdr-1.7.36.orig/recording.c 2013-01-27 12:54:57.740017655 +0100 +++ vdr-1.7.36/recording.c 2013-01-27 12:56:24.236017960 +0100 @@ -8,6 +8,7 @@ */ #include "recording.h" +#include "iconpatch.h" #include <ctype.h> #include <dirent.h> #include <errno.h> @@ -881,7 +882,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) const { - char New = NewIndicator && IsNew() ? '*' : ' '; + const char *New = NewIndicator && IsNew() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_NEW_UTF8 : ICON_NEW : "*" : " "; free(titleBuffer); titleBuffer = NULL; if (Level < 0 || Level == HierarchyLevels()) { ++++++ vdr-2.0.3-dynamite.patch ++++++ ++++ 810 lines (skipped) ++++++ vdr-2.0.4-MainMenuHooks-v1_0_1.patch ++++++ This is a "patch" for the Video Disk Recorder (VDR). * History 2010-10-15: Version 1.0.1 - return a cOsdObject instead of its subclass cOsdMenu (thanks to Joe_D@vdrportal) - version number defines in config.h now follow the ususal conventions: MAINMENUHOOKSVERSNUM is now a number, the newly added define MAINMENUHOOKSVERSION is a string (suggested by gnapheus@vdrportal) - patch is now based on VDR 1.6.0 - updated documentation 2007-02-26: Version 1.0 - Initial revision. * Authors: Tobias Grimm <vdr at e-tobi dot net> Martin Prochnow <nordlicht at martins-kabuff dot de> Frank Schmirler <vdrdev at schmirler dot de> Christian Wieninger <cwieninger at gmx dot de> * Description: This patch allows plugins to replace the VDR mainmenus "Schedule", "Channels", "Timers" and "Recordings" by a different implementation. The patch is based on a suggestion of Christian Wieninger back in 2006 (http://www.linuxtv.org/pipermail/vdr/2006-March/008234.html) It is meant to be an interim solution for VDR 1.4 until (maybe) VDR 1.5 introduces an official API for this purpose. * Installation Change into the VDR source directory, then issue patch -p1 < path/to/MainMenuHooks-v1_0_1.patch and recompile. * Notes for plugin authors The following code sample shows the required plugin code for replacing the original Schedule menu: bool cMyPlugin::Service(const char *Id, void *Data) { cOsdMenu **menu = (cOsdMenu**) Data; if (MySetup.replaceSchedule && strcmp(Id, "MainMenuHooksPatch-v1.0::osSchedule") == 0) { if (menu) *menu = (cOsdMenu*) MainMenuAction(); return true; } return false; } Since patch version 1.0.1 the service call may return a cOsdObject instead of a cOsdMenu. Use "#ifdef MAINMENUHOOKSVERSION" to detect version 1.0.1. A plugin can replace more than one menu at a time. Simply replace the call to MainMenuAction() in the sample above by appropriate code. Note that a plugin *should* offer a setup option which allows the user to enable or disable the replacement. "Disabled" would be a reasonable default setting. By testing for define MAINMENUHOOKSVERSNUM, a plugin can leave the setup option out at compiletime. In case there is an internal problem when trying to open the replacement menu, it is safe to return true even though Data is NULL. However an OSD message should indicate the problem to the user. Feel free to ship this patch along with your plugin. However if you think you need to modify the patch, we'd encourage you to contact the authors first or at least use a service id which differs in more than just the version number. diff -ru vdr.orig/menu.c vdr/menu.c --- vdr.orig/menu.c 2013-03-18 09:11:48.000000000 +0000 +++ vdr/menu.c 2013-03-27 17:29:58.767375783 +0000 @@ -3379,15 +3379,31 @@ // Initial submenus: + cOsdObject *menu = NULL; switch (State) { - case osSchedule: AddSubMenu(new cMenuSchedule); break; - case osChannels: AddSubMenu(new cMenuChannels); break; - case osTimers: AddSubMenu(new cMenuTimers); break; - case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break; - case osSetup: AddSubMenu(new cMenuSetup); break; - case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break; + case osSchedule: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) + menu = new cMenuSchedule; + break; + case osChannels: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) + menu = new cMenuChannels; + break; + case osTimers: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) + menu = new cMenuTimers; + break; + case osRecordings: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) + menu = new cMenuRecordings(NULL, 0, OpenSubMenus); + break; + case osSetup: menu = new cMenuSetup; break; + case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; default: break; } + if (menu) + if (menu->IsMenu()) + AddSubMenu((cOsdMenu *) menu); } cOsdObject *cMenuMain::PluginOsdObject(void) @@ -3495,13 +3511,34 @@ eOSState state = cOsdMenu::ProcessKey(Key); HadSubMenu |= HasSubMenu(); + cOsdObject *menu = NULL; switch (state) { - case osSchedule: return AddSubMenu(new cMenuSchedule); - case osChannels: return AddSubMenu(new cMenuChannels); - case osTimers: return AddSubMenu(new cMenuTimers); - case osRecordings: return AddSubMenu(new cMenuRecordings); - case osSetup: return AddSubMenu(new cMenuSetup); - case osCommands: return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); + case osSchedule: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) + menu = new cMenuSchedule; + else + state = osContinue; + break; + case osChannels: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) + menu = new cMenuChannels; + else + state = osContinue; + break; + case osTimers: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) + menu = new cMenuTimers; + else + state = osContinue; + break; + case osRecordings: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) + menu = new cMenuRecordings; + else + state = osContinue; + break; + case osSetup: menu = new cMenuSetup; break; + case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) { cOsdItem *item = Get(Current()); if (item) { @@ -3553,6 +3590,12 @@ default: break; } } + if (menu) { + if (menu->IsMenu()) + return AddSubMenu((cOsdMenu *) menu); + pluginOsdObject = menu; + return osPlugin; + } if (!HasSubMenu() && Update(HadSubMenu)) Display(); if (Key != kNone) { diff -ru vdr.orig/config.h vdr/config.h --- vdr.orig/config.h 2013-03-16 15:12:14.000000000 +0000 +++ vdr/config.h 2013-03-27 17:50:05.204415063 +0000 @@ -36,6 +36,10 @@ // plugins to work with newer versions of the core VDR as long as no // VDR header files have changed. +// The MainMenuHook Patch's version number: +#define MAINMENUHOOKSVERSION "1.0.1" +#define MAINMENUHOOKSVERSNUM 10001 // Version * 10000 + Major * 100 + Minor + #define MAXPRIORITY 99 #define MINPRIORITY (-MAXPRIORITY) #define LIVEPRIORITY 0 // priority used when selecting a device for live viewing ++++++ vdr-2.0.6-wareagle-fix.patch ++++++ Index: b/recording.c =================================================================== --- a/recording.c +++ b/recording.c @@ -1040,7 +1040,7 @@ const char *cRecording::Title(char Delim Minutes % 60 ); } - titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%c%c%s", + titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%s%c%s", t->tm_mday, t->tm_mon + 1, t->tm_year % 100, ++++++ vdr-1.6.0.tar.bz2 -> vdr-2.0.6.tar.bz2 ++++++ ++++ 95716 lines of diff (skipped) ++++++ vdr-shutdown.sh ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:24.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:24.000000000 +0200 @@ -6,10 +6,12 @@ timer_fname="$4" # filename for next recording manual_shutdown="$5" # 1 if shutdown reqested by user +HALT_OPTIONS="-p" + test -f /etc/sysconfig/vdr && . /etc/sysconfig/vdr if [ "$VDR_SHUTDOWN" = "fast" ]; then -HALT_OPTIONS="-f" + HALT_OPTIONS+=" -f" fi # you need to add the following line to /etc/sudoers to make this script work ++++++ vdr.macros ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:24.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:24.000000000 +0200 @@ -1,28 +1,29 @@ -%vdr_install_plugin() \ -for i in %*; do \ - install -d -m 755 %{buildroot}%{vdr_libdir} \ - install -m 755 libvdr-$i.so %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion} \ -done \ +%vdrapi %(pkg-config --variable=apiversion vdr) + +%vdr_find_locale \ +echo '%%defattr (644, root, root, 755)' > vdrlocale.files \ +find %{buildroot}%{vdr_localedir} -type f -printf '%%P\\n' | while read f; do \ + echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" \ +done >> vdrlocale.files \ +%{nil} + +%vdr_find_locale_name(n:) \ +echo '%%defattr (644, root, root, 755)' > vdrlocale.files \ +find %{buildroot}%{vdr_localedir} -type f -name %{-n*}.mo -printf '%%P\\n' | while read f; do \ + echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" \ +done >> %{-n*}.files \ %{nil} -# for newer plugins, which automatically add the apiversion during build -%vdr_install_plugin_new() \ -for i in %*; do \ - install -d -m 755 %{buildroot}%{vdr_libdir} \ - install -m 755 libvdr-$i.so.%{vdr_apiversion} %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion} \ -done \ +%vdr_dirs \ +%dir %{_libdir}/vdr \ +%dir %{_datadir}/vdr \ +%dir %{vdr_localedir} \ +%dir %{vdr_localedir}/* \ +%dir %{vdr_localedir}/*/LC_MESSAGES \ %{nil} -%vdr_install_plugin_locale \ -if [ -d locale ]; then \ - cd locale \ - install -d -m 755 %buildroot%{vdr_localedir} \ - for i in *_*; do \ - install -d -m 755 %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ - install -m 644 $i/LC_MESSAGES/*.mo %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ - done \ - cd .. \ -fi \ +%vdr_dirs_no_locale \ +%dir %{_libdir}/vdr \ %{nil} %vdr_make() \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0