March 2014 - openSUSE Commits - openSUSE Mailing Lists

commit qupzilla for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package qupzilla for openSUSE:Factory checked in at 2014-03-01 07:47:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qupzilla (Old) and /work/SRC/openSUSE:Factory/.qupzilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qupzilla" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla-qt5.changes 2014-03-01 07:47:49.000000000 +0100 @@ -0,0 +1,324 @@ +------------------------------------------------------------------- +Thu Feb 27 18:37:27 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Create qupzilla-qt5 package as branch to Qt4 version, and enable + conditionals as per requirements + +------------------------------------------------------------------- +Fri Feb 14 11:30:16 UTC 2014 - javier(a)opensuse.org + +- Update to 1.6.3 + * released 14 February 2014 + * addded new Spanish (Mexico) translation + * option to change list of SslV3 forced sites in settings.ini + * show error message when downloading AdBlock subscriptions fails + * fixed building on FreeBSD, OS/2 + +------------------------------------------------------------------- +Thu Feb 13 19:53:14 UTC 2014 - javier(a)opensuse.org + +- Update to 1.6.2 + * workaround for servers not understanding TLSv1 handshake + * tabs on top are now enabled by default + * restore session after launch is now enabled by default + * don't load tabs until selected is now enabled by default + * tab previews are now disabled by default + * reworked scrolling with wheel in tabbar + * Ctrl+W shortcut no longer closes a pinned tab + * fixed: setting DuckDuckGo as default search provider + * fixed: issues detected by scan.coverity.com + * fixed: showing more default search engines with same name + * fixed: incorrect exception rules handling in AdBlock + * fixed: flickering when removing tabs from tabbar + * fixed: flickering when (un)pinning tabs + * fixed: flickering when opening new tabs with sites that loads instantly + * fixed: drawing correct mouseouver state for tabs + * fixed: drawing tabbar correctly with Oxygen style + * fixed: drawing list items with Qt5 Fusion style + * fixed: tooltips disappearing on (un)pinning tabs + * fixed: incorrectly changing current index when closing tabs in inactive + tabbar + * fixed: incorrectly showing url in locationbar when load request was not + accepted + * fixed: always add slash '/' between path and filename when downloading files + * fixed: cursor jumping at the start in locationbar + * mac: fixed toggle fullscreen action in menu + * windows: save application data in %LOCALAPPDATA% + +------------------------------------------------------------------- +Thu Feb 13 01:28:20 UTC 2014 - javier(a)opensuse.org + +- Source field in spec file changed. The 1.6.1 tarball had to be + recreated and this updated tarball is only available on GitHub + +------------------------------------------------------------------- +Thu Feb 6 00:54:19 UTC 2014 - javier(a)opensuse.org + +- Update to 1.6.1 + * added option to disable inline completion in locationbar + * added option to always switch tabs with mouse wheel + * added option to toggle fullscreen with commandline option + * added undo/redo context menu actions in editable web elements + * speedup loading rules from subscriptions in AdBlock dialog + * fixed speed dial with disabled javascript + * fixed showing tooltips on tabs when tab previews are disabled + * fixed search shortcuts longer than one character in locationbar + * fixed building issues on OS X and OS/2 + * fixed disabling tab previews from preferences + * fixed building new Gnome/KDE keyring passwords + * fixed building StatusBarIcons plugin on Windows + * win: add new jumplist option to open private window +- Add gdb workaround (see QTBUG-34950) +- Remove patches that have been merged into upstream +------------------------------------------------------------------- +Thu Jan 2 17:06:47 UTC 2014 - fisiu(a)opensuse.org + +- Build kwallet and gnome keyring plugins and put them into separate + subpackages to minimize dependency volume. +- Added patches: + * qupzilla-dont-show-tabs-when-disabled.patch + * qupzilla-gnome-integration-defines-fix.patch + * qupzilla-integration-plugins-fix.patch + * qupzilla-reload-settings-fix.patch + +------------------------------------------------------------------- +Wed Jan 1 21:48:05 UTC 2014 - fisiu(a)opensuse.org + +- Update to 1.6.0: + * added support for Proxy Auto-Config (PAC) + * added option to open another private window from private window + * added option to detach tabs from window + * added delete action in edit context menu on page + * added possibility to remove EasyList from AdBlock + * added inline domain completion to urlbar + * added KWallet password backend plugin + * added Gnome-Keyring password backend plugin + * added StatusBar Icons plugin that adds extra icons to statusbar + * added support for POST method in search engines manager + * added context menu for translating webpage + * added possibility to export bookmarks to html file + * great performance improvement for matching basic rules in AdBlock + * themes can now be loaded from profile directories + * pagescreen can now save output into number of formats, including PDF + * proxy exceptions now supports wildcards (*, ?) + * cancel upload when trying to upload non-readable files + * select previous / next engines with ctrl+up/down in websearchbar + * ask user first before closing all but the current tab from tabbar + * last 2 sessions are now backuped in profile directory + * always show tab previews after a small delay + * GreaseMonkey: added icon in statusbar + * GreaseMonkey: added support for GM_Settings + * GreaseMonkey: fixed userscripts when first loading plugin + * GreaseMonkey: run userscripts in all frames on page + * oxygen: set rounded corners for tooltips + * oxygen: workaround for transparent background of tooltips + * X11: Set correct WM_CLASS property to windows + * fixed: size of preferences dialog on low-res screens + * fixed: loading plugins with relative paths in portable build + * fixed: displaying a lot of RSS feeds in RSS widget in locationbar + * fixed: enabling disabled rules in AdBlock now works everytime + * fixed: parsing OpenSearch files with XML declaration + * fixed: don't show urls multiple times in url completer + * fixed: drag & drop moving folders under bookmarks toolbar + * fixed: files with relative paths can now be opened from command line + * fixed: issues with overflowing tabs, it is now possible scroll through all tabs + +------------------------------------------------------------------- +Sat Dec 7 21:04:52 UTC 2013 - cgiboudeaux(a)gmx.com + +- Update to 1.4.4 + * Added ctrl/shift + insert shortcuts to copy/paste in webview + * Don't try to download empty page + * Reverted forcing SSLv3 protocol for secured connections + * Duckduckgo.com is now default search engine + * Fixed: correct height of icons widget in SiteInfo + * Fixed: hide tabbar with only one tab option now works in fullscreen + * Fixed: crash with Oxygen theme when closing windows with tabs on top + * Fixed: saving IgnoreAllSSLWarnings option from SSLManager + * Fixed: crash on saving settings with unavailable theme + * Fixed: Accept-Language header now works with all sites + * Fixed: using external download manager with use defined location setting + * GreaseMonkey: fixed buttons in script list with RTL layout + * GreaseMonkey: run userscripts in all frames on page + * X11: Set correct WM_CLASS property to windows + +------------------------------------------------------------------- +Mon May 27 10:15:52 UTC 2013 - fisiu(a)opensuse.org + +- Update to 1.4.3 (changes since 1.4.0): + * fixed: crash upon closing private browsing window + * fixed: element hiding rules not working when more than 5000 in + subscription + * fixed: saving some tab icons in session file + * fixed: make Acid3 test pass even with AdBlock enabled + * don't limit speed of loading animation in tabbar + * fixed loading HTML5 videos on YouTube + * fixed saving cursive font in fonts preferences + * fixed translating edit actions in page context menu + * fixed connecting to older secured servers by forcing older SSL + protocol + * fixed installing bash completions to correct folder + * fixed deleting lockfile upon closing application + * fixed occasional crash when extracting form data from page + * fixed crash in akn plugin while closing tab with labels shown + * fixed crash on close when tabs on top is enabled with oxygen + theme + * GreaseMonkey: fixed laoding scripts with last line commented + * fixed websearchbar not respecting select all on click settings + * fixed certificates from custom path disappearing on saving + preferences + * fixed showing empty back/forward history menu upon restoring + session + * fixed duplicating current url in history when restoring + session + * fixed instantly showing popup when clicking on back/forward + button + +------------------------------------------------------------------- +Mon Mar 11 20:30:16 UTC 2013 - dmitry_r(a)opensuse.org + +- Update to version 1.4.0 + * highlighting host in address in locationbar + * can now be compiled using Qt 5 + * QtWebKit 2.3 new features - caret browsing, animated scrolling + * added support for FTP listing files and downloading + * added support for saving passwords of multiple users per site + * added support for showing tabs on top + * added bash autocompletion file + * added more actions to super menu, also show menu inside window + * possibility to select text on page with Shift+Arrow keys + * asking user whether to allow site to use notifications/geolocation + * option to set JavaScript privacy permissions + * use .qupzilla/tmp instead of /tmp for temporary data + * saving passwords should now work for much more sites + * improved showing navigation toolbar in fullscreen + * moved config directory into ~/.config/qupzilla + * certificates bundle is now only used on windows + * reduced memory usage of AdBlock (saves up to 30MB with just EasyList) ++++ 127 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla-qt5.changes --- /work/SRC/openSUSE:Factory/qupzilla/qupzilla.changes 2014-02-19 07:24:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla.changes 2014-03-01 07:47:49.000000000 +0100 @@ -1,0 +2,47 @@ +Thu Feb 27 18:37:27 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Create qupzilla-qt5 package as branch to Qt4 version, and enable + conditionals as per requirements + +------------------------------------------------------------------- +Fri Feb 14 11:30:16 UTC 2014 - javier(a)opensuse.org + +- Update to 1.6.3 + * released 14 February 2014 + * addded new Spanish (Mexico) translation + * option to change list of SslV3 forced sites in settings.ini + * show error message when downloading AdBlock subscriptions fails + * fixed building on FreeBSD, OS/2 + +------------------------------------------------------------------- +Thu Feb 13 19:53:14 UTC 2014 - javier(a)opensuse.org + +- Update to 1.6.2 + * workaround for servers not understanding TLSv1 handshake + * tabs on top are now enabled by default + * restore session after launch is now enabled by default + * don't load tabs until selected is now enabled by default + * tab previews are now disabled by default + * reworked scrolling with wheel in tabbar + * Ctrl+W shortcut no longer closes a pinned tab + * fixed: setting DuckDuckGo as default search provider + * fixed: issues detected by scan.coverity.com + * fixed: showing more default search engines with same name + * fixed: incorrect exception rules handling in AdBlock + * fixed: flickering when removing tabs from tabbar + * fixed: flickering when (un)pinning tabs + * fixed: flickering when opening new tabs with sites that loads instantly + * fixed: drawing correct mouseouver state for tabs + * fixed: drawing tabbar correctly with Oxygen style + * fixed: drawing list items with Qt5 Fusion style + * fixed: tooltips disappearing on (un)pinning tabs + * fixed: incorrectly changing current index when closing tabs in inactive + tabbar + * fixed: incorrectly showing url in locationbar when load request was not + accepted + * fixed: always add slash '/' between path and filename when downloading files + * fixed: cursor jumping at the start in locationbar + * mac: fixed toggle fullscreen action in menu + * windows: save application data in %LOCALAPPDATA% + +------------------------------------------------------------------- Old: ---- QupZilla-1.6.1.tar.gz New: ---- QupZilla-1.6.3.tar.gz pre_checkin.sh qupzilla-qt5.changes qupzilla-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qupzilla-qt5.spec ++++++ # # spec file for package qupzilla # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012-2014 Mariusz Fik <fisiu(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define qt5_build 1 %if !0%{?qt5_build} Name: qupzilla %else Name: qupzilla-qt5 %endif Version: 1.6.3 Release: 0 Summary: A very fast open source browser based on WebKit core License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers Url: http://qupzilla.com/ Source: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla… # WORKAROUND FOR QTBUG-34950 Patch0: qupzilla-gdb-workaround.patch BuildRequires: fdupes %if !0%{?qt5_build} BuildRequires: libkde4-devel BuildRequires: pkgconfig(gnome-keyring-1) %endif BuildRequires: pkgconfig(hunspell) %if 0%{?qt5_build} BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) %if 0%{?suse_version} > 1310 BuildRequires: libQt5Gui-private-headers-devel %else BuildRequires: libqt5-qtbase-private-headers-devel %endif BuildRequires: libqt5-qttools BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5WebKitWidgets) %else BuildRequires: pkgconfig(QtCore) >= 4.7 BuildRequires: pkgconfig(QtGui) >= 4.7 BuildRequires: pkgconfig(QtNetwork) >= 4.7 BuildRequires: pkgconfig(QtWebKit) %endif BuildRequires: pkgconfig(openssl) BuildRequires: update-desktop-files %if 0%{?qt5_build} Conflicts: qupzilla %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description QupZilla is modern web browser based on WebKit core and Qt Framework. WebKit guarante fast browsing and Qt availability on all major platforms. %if !0%{?qt5_build} %package kwallet Summary: Kwallet plugin for qupzilla Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} %description kwallet Kwallet plugin for QupZilla browser which allows to store passwords in kwallet. %package gnome-keyring Summary: Gnome keyring plugin for qupzilla Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} %description gnome-keyring Gnome keyring plugin for QupZilla browser which allows to store passwords in gnome keyring. %endif %prep %setup -q -n QupZilla-%{version} # WORKAROUND for QTBUG-34950. %patch0 -p1 # remove BUILDTIME usage from build sed '/static const QString BUILDTIME/d' -i src/lib/app/qupzilla.h sed '/QupZilla::BUILDTIME/d' -i src/lib/other/aboutdialog.cpp sed '/QupZilla::BUILDTIME/d' -i src/lib/app/commandlineoptions.cpp sed '/QupZilla::BUILDTIME/d' -i src/lib/app/qupzilla.cpp sed '/QupZilla::BUILDTIME/d' -i src/lib/network/schemehandlers/qupzillaschemehandler.cpp %build export USE_WEBGL=true %if !0%{?qt5_build} # It enables better kde integration, it's also needed for kwallet plugin. export KDE_INTEGRATION=true # It enables gnome keyring support export GNOME_INTEGRATION=true %endif # It sets proper LIBPATH. export USE_LIBPATH=%{_libdir} %if !0%{?qt5_build} # Debug config is needed for -debuginfo and -debugsource packages. qmake CONFIG+=debug %else %{_libqt5_qmake} %endif make %{?_smp_mflags} %install make INSTALL_ROOT=%{buildroot} install # FIXME: split library into separate package and build also -devel with libqupzilla.so ??? rm -vf %{buildroot}%{_libdir}/libQupZilla.so # We don't need a test plugin which does nothing. rm -vf %{buildroot}%{_libdir}/qupzilla/libTestPlugin.so # End %suse_update_desktop_file qupzilla %fdupes -s %{buildroot}%{_datadir} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYRIGHT FAQ GPLv3 %{_bindir}/qupzilla %{_libdir}/libQupZilla.so.* %dir %{_libdir}/qupzilla %{_libdir}/qupzilla/libAccessKeysNavigation.so %{_libdir}/qupzilla/libMouseGestures.so %{_libdir}/qupzilla/libGreaseMonkey.so %{_libdir}/qupzilla/libPIM.so %{_libdir}/qupzilla/libStatusBarIcons.so %{_datadir}/applications/qupzilla.desktop %{_datadir}/pixmaps/qupzilla.png %{_datadir}/icons/hicolor %dir %{_datadir}/qupzilla %{_datadir}/qupzilla/locale %{_datadir}/qupzilla/themes %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/qupzilla %if !0%{?qt5_build} %files kwallet %defattr(-,root,root) %{_libdir}/qupzilla/libKWalletPasswords.so %files gnome-keyring %defattr(-,root,root) %{_libdir}/qupzilla/libGnomeKeyringPasswords.so %endif %changelog ++++++ qupzilla.spec ++++++ --- /var/tmp/diff_new_pack.ZeEbCS/_old 2014-03-01 07:47:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ZeEbCS/_new 2014-03-01 07:47:50.000000000 +0100 @@ -16,35 +16,69 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define qt5_build 0 + +%if !0%{?qt5_build} Name: qupzilla -Version: 1.6.1 +%else +Name: qupzilla-qt5 +%endif +Version: 1.6.3 Release: 0 -License: GPL-3.0+ Summary: A very fast open source browser based on WebKit core -Url: http://qupzilla.com/ +License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers +Url: http://qupzilla.com/ Source: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla… # WORKAROUND FOR QTBUG-34950 Patch0: qupzilla-gdb-workaround.patch BuildRequires: fdupes +%if !0%{?qt5_build} BuildRequires: libkde4-devel BuildRequires: pkgconfig(gnome-keyring-1) +%endif BuildRequires: pkgconfig(hunspell) +%if 0%{?qt5_build} +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Widgets) +%if 0%{?suse_version} > 1310 +BuildRequires: libQt5Gui-private-headers-devel +%else +BuildRequires: libqt5-qtbase-private-headers-devel +%endif +BuildRequires: libqt5-qttools +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +%else BuildRequires: pkgconfig(QtCore) >= 4.7 BuildRequires: pkgconfig(QtGui) >= 4.7 BuildRequires: pkgconfig(QtNetwork) >= 4.7 BuildRequires: pkgconfig(QtWebKit) +%endif +BuildRequires: pkgconfig(openssl) BuildRequires: update-desktop-files +%if 0%{?qt5_build} +Conflicts: qupzilla +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description QupZilla is modern web browser based on WebKit core and Qt Framework. WebKit guarante fast browsing and Qt availability on all major platforms. +%if !0%{?qt5_build} %package kwallet Summary: Kwallet plugin for qupzilla Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} + %description kwallet Kwallet plugin for QupZilla browser which allows to store passwords in kwallet. @@ -52,9 +86,11 @@ Summary: Gnome keyring plugin for qupzilla Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} + %description gnome-keyring Gnome keyring plugin for QupZilla browser which allows to store passwords in gnome keyring. +%endif %prep %setup -q -n QupZilla-%{version} @@ -69,14 +105,20 @@ %build export USE_WEBGL=true +%if !0%{?qt5_build} # It enables better kde integration, it's also needed for kwallet plugin. export KDE_INTEGRATION=true # It enables gnome keyring support export GNOME_INTEGRATION=true +%endif # It sets proper LIBPATH. export USE_LIBPATH=%{_libdir} +%if !0%{?qt5_build} # Debug config is needed for -debuginfo and -debugsource packages. qmake CONFIG+=debug +%else +%{_libqt5_qmake} +%endif make %{?_smp_mflags} %install @@ -86,8 +128,8 @@ # We don't need a test plugin which does nothing. rm -vf %{buildroot}%{_libdir}/qupzilla/libTestPlugin.so # End -%suse_update_desktop_file %{name} -%fdupes %{buildroot}%{_datadir} +%suse_update_desktop_file qupzilla +%fdupes -s %{buildroot}%{_datadir} %post -p /sbin/ldconfig @@ -96,7 +138,7 @@ %files %defattr(-,root,root) %doc AUTHORS COPYRIGHT FAQ GPLv3 -%{_bindir}/%{name} +%{_bindir}/qupzilla %{_libdir}/libQupZilla.so.* %dir %{_libdir}/qupzilla %{_libdir}/qupzilla/libAccessKeysNavigation.so @@ -104,16 +146,17 @@ %{_libdir}/qupzilla/libGreaseMonkey.so %{_libdir}/qupzilla/libPIM.so %{_libdir}/qupzilla/libStatusBarIcons.so -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/qupzilla.desktop +%{_datadir}/pixmaps/qupzilla.png %{_datadir}/icons/hicolor -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/locale -%{_datadir}/%{name}/themes +%dir %{_datadir}/qupzilla +%{_datadir}/qupzilla/locale +%{_datadir}/qupzilla/themes %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/qupzilla +%if !0%{?qt5_build} %files kwallet %defattr(-,root,root) %{_libdir}/qupzilla/libKWalletPasswords.so @@ -121,5 +164,6 @@ %files gnome-keyring %defattr(-,root,root) %{_libdir}/qupzilla/libGnomeKeyringPasswords.so +%endif %changelog ++++++ QupZilla-1.6.1.tar.gz -> QupZilla-1.6.3.tar.gz ++++++ ++++ 27787 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ #!/bin/sh cp qupzilla.spec qupzilla-qt5.spec sed -e 's,qt5_build 0,qt5_build 1,' qupzilla.spec > qupzilla-qt5.spec cp qupzilla.changes qupzilla-qt5.changes ++++++ qupzilla-gdb-workaround.patch ++++++ --- /var/tmp/diff_new_pack.ZeEbCS/_old 2014-03-01 07:47:51.000000000 +0100 +++ /var/tmp/diff_new_pack.ZeEbCS/_new 2014-03-01 07:47:51.000000000 +0100 @@ -7,7 +7,7 @@ +# workaround for https://bugreports.qt-project.org/browse/QTBUG-34950 +CONFIG -= gdb_dwarf_index + - unix: VERSION = 1.6.1 + unix: VERSION = 1.6.3 # Please read BUILD information # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit emotion-generic-players for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package emotion-generic-players for openSUSE:Factory checked in at 2014-03-01 07:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emotion-generic-players (Old) and /work/SRC/openSUSE:Factory/.emotion-generic-players.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emotion-generic-players" Changes: -------- --- /work/SRC/openSUSE:Factory/emotion-generic-players/emotion-generic-players.changes 2014-02-15 08:02:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emotion-generic-players.new/emotion-generic-players.changes 2014-03-01 07:47:40.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 27 03:39:01 UTC 2014 - simon(a)simotek.net + +- Updated to 1.9.0 with the rest of the efl release. + As the release notes don't meantion any new features + this is just a bug fix and keeping versions in sync release + +------------------------------------------------------------------- Old: ---- emotion_generic_players-1.8.0.tar.bz2 New: ---- emotion_generic_players-1.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emotion-generic-players.spec ++++++ --- /var/tmp/diff_new_pack.Fok1AR/_old 2014-03-01 07:47:42.000000000 +0100 +++ /var/tmp/diff_new_pack.Fok1AR/_new 2014-03-01 07:47:42.000000000 +0100 @@ -17,7 +17,7 @@ Name: emotion-generic-players -Version: 1.8.0 +Version: 1.9.0 Release: 0 Summary: Set of generic players for Emotion License: BSD-2-Clause ++++++ emotion_generic_players-1.8.0.tar.bz2 -> emotion_generic_players-1.9.0.tar.bz2 ++++++ ++++ 1707 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/AUTHORS new/emotion_generic_players-1.9.0/AUTHORS --- old/emotion_generic_players-1.8.0/AUTHORS 2013-03-02 00:32:33.000000000 +0100 +++ new/emotion_generic_players-1.9.0/AUTHORS 2014-02-24 16:10:19.000000000 +0100 @@ -6,4 +6,15 @@ Pierre Le Magourou <pierre.lemagourou(a)openwide.fr> Rafael Antognolli <antognolli(a)profusion.mobi> Sohyun Kim <anna1014.kim(a)samsung.com> - +Carsten Haitzler (Rasterman) <raster(a)rasterman.com> +Davide Andreoli <dave(a)gurumeditation.it> +Gustavo Sverzut Barbieri <barbieri(a)gmail.com> +Stefan Schmidt <s.schmidt(a)samsung.com> +Bruno Dilly <bdilly(a)profusion.mobi> +ChunEon Park <hermet(a)hermet.pe.kr> +Daniel Juyung Seo <juyung.seo(a)samsung.com> +Doug Newgard <scimmia22(a)outlook.com> +Jerome Pinot <ngc891(a)gmail.com> +Mike Blumenkrantz <zmike(a)samsung.com> +Sebastian Dransfeld <sd(a)tango.flipp.net> +Vincent Torri <vincent.torri(a)gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/COPYING new/emotion_generic_players-1.9.0/COPYING --- old/emotion_generic_players-1.8.0/COPYING 2013-03-02 00:32:33.000000000 +0100 +++ new/emotion_generic_players-1.9.0/COPYING 2014-02-18 10:35:48.000000000 +0100 @@ -1,6 +1,6 @@ Copyright notice for Emotion: -Copyright (C) 2004-2011 Carsten Haitzler and various contributors (see AUTHORS) +Copyright (C) 2004-2014 Carsten Haitzler and various contributors (see AUTHORS) All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/ChangeLog new/emotion_generic_players-1.9.0/ChangeLog --- old/emotion_generic_players-1.8.0/ChangeLog 2013-03-02 00:32:33.000000000 +0100 +++ new/emotion_generic_players-1.9.0/ChangeLog 2014-02-19 13:52:07.000000000 +0100 @@ -3,3 +3,10 @@ * Created the project based on previous emotion/src/generic_players, as it was removed when Emotion was merged into EFL single-tree. + + +OUT OF DATE NOTICE: +------------------- +With the start of the 1.9.x release cycle we now longer update the ChangeLog and rely on git log for +this functionality. We keep however a NEWS files for a high level overview of changes in a new +release which will be filled at the end of the release cycle. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/NEWS new/emotion_generic_players-1.9.0/NEWS --- old/emotion_generic_players-1.8.0/NEWS 2013-03-02 00:32:33.000000000 +0100 +++ new/emotion_generic_players-1.9.0/NEWS 2014-02-24 17:03:55.000000000 +0100 @@ -0,0 +1,27 @@ +Emotion Generic Players 1.9.0 + +Changes since Emotion Generic Players 1.8.0: +-------------------------------------------- + +Improvements: + + * Emotion VLC player: debug++ + * Emotion VLC: cleanup: only changed function order in file. + * Simplify player version dir fallback to match efl 1.9 simplification changes + * Emotion_generic_players - commented out unused func. + * Emotion VLC: no more need to send the size twice. + * Emotion VLC: use Eina_Bool instead of int for bools. + * Emotion VLC: defer the resource free until the video is actually stopped. + +Fixes: + + * Emotion VLC backend: fix pause/stop to work again. + The EM_CMD_STOP command do not have any parameter so it must be + handled in the first call of the pipe. + * Check for libvlc >= 2.0 as a minimum as we use 2.x funcs + * Emotion VLC: remove quite all the old hacks from loading stage which fixes the problem that + audio was audible on start + * Emotion VLC: fix the random-player-stop bug !! + * Emotion VLC: fix send position_change while paused. + * Emotion VLC: recreate the player when end reached. + * Emotion VLC: fix the volume/mute bug. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/README new/emotion_generic_players-1.9.0/README --- old/emotion_generic_players-1.8.0/README 2013-12-01 06:54:14.000000000 +0100 +++ new/emotion_generic_players-1.9.0/README 2014-02-19 13:53:10.000000000 +0100 @@ -1,4 +1,4 @@ -Emotion Generic Players 1.8.0 +Emotion Generic Players 1.9.0 ============================= ****************************************************************************** @@ -31,7 +31,7 @@ REQUIREMENTS ------------ - * vlc (libvlc) + * vlc (libvlc >= 2.0) COMPONENTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/config.h.in new/emotion_generic_players-1.9.0/config.h.in --- old/emotion_generic_players-1.8.0/config.h.in 2013-12-01 10:57:29.000000000 +0100 +++ new/emotion_generic_players-1.9.0/config.h.in 2014-02-24 17:05:22.000000000 +0100 @@ -30,6 +30,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/configure.ac new/emotion_generic_players-1.9.0/configure.ac --- old/emotion_generic_players-1.8.0/configure.ac 2013-12-01 10:54:36.000000000 +0100 +++ new/emotion_generic_players-1.9.0/configure.ac 2014-02-24 17:01:46.000000000 +0100 @@ -1,13 +1,13 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) -m4_define([v_min], [8]) +m4_define([v_min], [9]) m4_define([v_mic], [0]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n'])) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line -dnl m4_define([relname], [dev]) +m4_define([relname], [dev]) dnl m4_define([v_rel], [-release relname]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], @@ -87,13 +87,13 @@ MODULE_ARCH=`pkg-config --variable=module_arch emotion` if test -z "${MODULE_ARCH}"; then - EMOTION_VERSION=`pkg-config --modversion emotion | cut -d. -f1-3` + EMOTION_VERSION=`pkg-config --modversion emotion | cut -d. -f1-2` case "$host_os" in mingw32ce*) - MODULE_ARCH="$host_os-$host_cpu" + MODULE_ARCH="v" ;; *) - MODULE_ARCH="$host_os-$host_cpu-${EMOTION_VERSION}" + MODULE_ARCH="v-${EMOTION_VERSION}" ;; esac fi @@ -110,7 +110,7 @@ AC_SUBST(MODULE_ARCH) #### Players -EMOTION_GENERIC_PLAYER([VLC], [yes], [libvlc >= 0.9 eina >= 1.1.99 ecore >= 1.7.99]) +EMOTION_GENERIC_PLAYER([VLC], [yes], [libvlc >= 2.0 eina >= 1.1.99 ecore >= 1.7.99]) AC_CONFIG_FILES([ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/emotion_generic_players-1.8.0/src/vlc/emotion_generic_vlc.c new/emotion_generic_players-1.9.0/src/vlc/emotion_generic_vlc.c --- old/emotion_generic_players-1.8.0/src/vlc/emotion_generic_vlc.c 2013-11-29 11:09:53.000000000 +0100 +++ new/emotion_generic_players-1.9.0/src/vlc/emotion_generic_vlc.c 2014-02-24 16:10:19.000000000 +0100 @@ -29,60 +29,54 @@ #define WRN(...) EINA_LOG_DOM_WARN(_em_vlc_log_dom, __VA_ARGS__) #define CRIT(...) EINA_LOG_DOM_CRIT(_em_vlc_log_dom, __VA_ARGS__) -enum _Thread_Events { - EM_THREAD_POSITION_CHANGED, - EM_THREAD_PLAYBACK_STARTED, - EM_THREAD_PLAYBACK_STOPPED, - EM_THREAD_LAST -}; typedef struct _App App; struct _App { Emotion_Generic_Video_Shared *vs; Emotion_Generic_Video_Frame vf; + libvlc_instance_t *libvlc; libvlc_media_t *m; libvlc_media_player_t *mp; libvlc_event_manager_t *event_mgr; - libvlc_event_manager_t *mevent_mgr; + + Ecore_Pipe *fd_read; // read commands from emotion here + Ecore_Pipe *fd_write; // write commands for emotion here + Eina_Lock cmd_mutex;// lock used to send just one command at a time + int last_order; // current command received from emotion + char *filename; char *subtitle_path; char *shmname; - void *tmpbuffer; - int w, h; - // Use Ecore infra for that instead - Ecore_Pipe *fd_read; // read commands from theads here - Ecore_Pipe *fd_write; // write commands from threads here - /* int em_read; // read commands from emotion here */ - /* int em_write; // write commands to emotion here */ - int size_sent; - int opening; - int closing; - int playing; - - int last_order; - + unsigned w, h; + int volume; + Eina_Bool audio_muted; + + Eina_Bool opening; + Eina_Bool closing; + Eina_Bool playing; Eina_Bool inited; }; -Eina_Bool -exit_func(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) -{ - ecore_main_loop_quit(); - return EINA_TRUE; -} +static void _player_setup(App *app); + -#define SEND_CMD_PARAM(app, i) \ - if ((app)->fd_write) \ - if (!ecore_pipe_write((app)->fd_write, &(i), sizeof((i)))) \ +/* Utilities to send commands back to emotion */ +#define SEND_CMD_PARAM(app, i) \ + if ((app)->fd_write) \ + if (!ecore_pipe_write((app)->fd_write, &(i), sizeof((i)))) \ ecore_main_loop_quit(); static void _send_cmd(App *app, int cmd) { - if (app->fd_write) - if (!ecore_pipe_write(app->fd_write, &cmd, sizeof(cmd))) - ecore_main_loop_quit(); + if (!app->fd_write) + return; + + eina_lock_take(&app->cmd_mutex); /* LOCK HERE */ + + if (!ecore_pipe_write(app->fd_write, &cmd, sizeof(cmd))) + ecore_main_loop_quit(); } static void @@ -100,35 +94,45 @@ } static void +_send_cmd_finish(App *app) +{ + eina_lock_release(&app->cmd_mutex); /* UNLOCK HERE */ +} + +/* Commands sent to the emotion pipe */ +static void _send_file_closed(App *app) { - app->closing = 0; - emotion_generic_shm_free(app->vs); _send_cmd(app, EM_RESULT_FILE_CLOSE); + _send_cmd_finish(app); } static void -_send_time_changed(struct _App *app, const struct libvlc_event_t *ev) +_send_time_changed(App *app) { - float new_time = ev->u.media_player_time_changed.new_time; + float new_time; - new_time /= 1000; if (app->vs->frame_drop > 1) return; + + new_time = libvlc_media_player_get_time(app->mp); + new_time /= 1000; _send_cmd(app, EM_RESULT_POSITION_CHANGED); SEND_CMD_PARAM(app, new_time); + _send_cmd_finish(app); } static void -_send_resize(struct _App *app, int width, int height) +_send_resize(App *app, int width, int height) { _send_cmd(app, EM_RESULT_FRAME_SIZE); SEND_CMD_PARAM(app, width); SEND_CMD_PARAM(app, height); + _send_cmd_finish(app); } static void -_send_track_info(struct _App *app, int cmd, int current, int count, libvlc_track_description_t *desc) +_send_track_info(App *app, int cmd, int current, int count, libvlc_track_description_t *desc) { _send_cmd(app, cmd); SEND_CMD_PARAM(app, current); @@ -141,10 +145,11 @@ _send_cmd_str(app, name); desc = desc->p_next; } + _send_cmd_finish(app); } static void -_send_all_track_info(struct _App *app) +_send_all_track_info(App *app) { int track_count, current; libvlc_track_description_t *desc; @@ -172,7 +177,7 @@ } static void -_send_all_meta_info(struct _App *app) +_send_all_meta_info(App *app) { const char *meta; @@ -198,80 +203,69 @@ _send_cmd_str(app, meta); meta = libvlc_media_get_meta(app->m, libvlc_meta_TrackNumber); _send_cmd_str(app, meta); + + _send_cmd_finish(app); } -static Eina_Bool -_loaded_idler(void *data) +static void +_send_length_changed(App *app) { - App *app = data; - - if (app->mp) - libvlc_media_player_stop(app->mp); + float length = libvlc_media_player_get_length(app->mp); - return EINA_FALSE; + length /= 1000; + _send_cmd(app, EM_RESULT_LENGTH_CHANGED); + SEND_CMD_PARAM(app, length); + _send_cmd_finish(app); } static void -_position_changed(App *app) +_send_seekable_changed(App *app, const struct libvlc_event_t *ev) { - int r; - unsigned int w, h; - - if (!app->opening) - return; - - /* sending size info only once */ - r = libvlc_video_get_size(app->mp, 0, &w, &h); - if (r < 0) - { - w = 1; - h = 1; - } - - if (w > 0 || h > 0) - { - _send_resize(app, w, h); - app->size_sent = 1; - } - - /* sending audio track info */ - _send_all_track_info(app); - - /* sending meta info */ - _send_all_meta_info(app); + int seekable = ev->u.media_player_seekable_changed.new_seekable; - ecore_idler_add(_loaded_idler, app); + _send_cmd(app, EM_RESULT_SEEKABLE_CHANGED); + SEND_CMD_PARAM(app, seekable); + _send_cmd_finish(app); } static void -_send_length_changed(struct _App *app, const struct libvlc_event_t *ev) +_send_playback_started(App *app) { - float length = ev->u.media_player_length_changed.new_length; - length /= 1000; - - _send_cmd(app, EM_RESULT_LENGTH_CHANGED); - SEND_CMD_PARAM(app, length); + _send_cmd(app, EM_RESULT_PLAYBACK_STARTED); + _send_cmd_finish(app); } static void -_send_seekable_changed(struct _App *app, const struct libvlc_event_t *ev) +_send_playback_stopped(App *app) { - int seekable = ev->u.media_player_seekable_changed.new_seekable; + _send_cmd(app, EM_RESULT_PLAYBACK_STOPPED); + _send_cmd_finish(app); +} - _send_cmd(app, EM_RESULT_SEEKABLE_CHANGED); - SEND_CMD_PARAM(app, seekable); +static void +_send_init(App *app) +{ + _send_cmd(app, EM_RESULT_INIT); + _send_cmd_finish(app); } static void -_send_file_set(struct _App *app) +_send_file_set(App *app) { - if (app->opening) - _send_cmd(app, EM_RESULT_FILE_SET); + _send_cmd(app, EM_RESULT_FILE_SET); + _send_cmd_finish(app); +} - if (app->closing) - _send_file_closed(app); +static void +_send_file_set_done(App *app, int success) +{ + _send_cmd(app, EM_RESULT_FILE_SET_DONE); + SEND_CMD_PARAM(app, success); + _send_cmd_finish(app); } + +/* VLC events and callbacks */ static void _event_cb(const struct libvlc_event_t *ev, void *data) { @@ -281,113 +275,82 @@ switch (ev->type) { case libvlc_MediaPlayerTimeChanged: - _send_time_changed(app, ev); - break; - case libvlc_MediaPlayerPositionChanged: - _position_changed(app); + // DBG("libvlc_MediaPlayerTimeChanged"); + _send_time_changed(app); break; case libvlc_MediaPlayerLengthChanged: - _send_length_changed(app, ev); + DBG("libvlc_MediaPlayerLengthChanged"); + _send_length_changed(app); break; case libvlc_MediaPlayerSeekableChanged: + DBG("libvlc_MediaPlayerSeekableChanged"); _send_seekable_changed(app, ev); break; case libvlc_MediaPlayerPlaying: - _send_resize(app, app->w, app->h); - _send_cmd(app, EM_RESULT_PLAYBACK_STARTED); + DBG("libvlc_MediaPlayerPlaying"); + libvlc_audio_set_volume(app->mp, app->volume); + libvlc_audio_set_mute(app->mp, app->audio_muted); + _send_playback_started(app); break; case libvlc_MediaPlayerStopped: - _send_file_set(app); + DBG("libvlc_MediaPlayerStopped"); + _send_playback_stopped(app); + if (app->closing) + { + free(app->filename); + app->filename = NULL; + free(app->subtitle_path); + app->subtitle_path = NULL; + libvlc_media_release(app->m); + app->m = NULL; + libvlc_media_player_release(app->mp); + app->mp = NULL; + emotion_generic_shm_free(app->vs); + app->playing = EINA_FALSE; + app->closing = EINA_FALSE; + _send_file_closed(app); + } break; case libvlc_MediaPlayerEndReached: - app->playing = 0; - _send_cmd(app, EM_RESULT_PLAYBACK_STOPPED); + DBG("libvlc_MediaPlayerEndReached"); + app->playing = EINA_FALSE; + /* vlc had released the media_playere here, we create a new one */ + app->mp = libvlc_media_player_new_from_media(app->m); + _player_setup(app); + _send_playback_stopped(app); break; } ecore_thread_main_loop_end(); } -static void * -_tmp_lock(void *data, void **pixels) -{ - App *app = data; - *pixels = app->tmpbuffer; - return NULL; -} - -static void -_tmp_unlock(void *data EINA_UNUSED, void *id EINA_UNUSED, void *const *pixels EINA_UNUSED) -{ -} - -static void -_tmp_display(void *data EINA_UNUSED, void *id EINA_UNUSED) -{ -} - -static unsigned -_tmp_format(void **opaque, char *chroma, - unsigned *width, unsigned *height, - unsigned *pitches, unsigned *lines) -{ - App *app = *opaque; - - app->tmpbuffer = realloc(app->tmpbuffer, - *width * *height * 4 * sizeof (char)); - strcpy(chroma, "RV32"); - pitches[0] = pitches[1] = pitches[2] = *width * 4; - lines[0] = lines[1] = lines[2] = *height; - - _send_resize(app, *width, *height); - - return 1; -} - static void -_tmp_play(void *data EINA_UNUSED, - const void *samples EINA_UNUSED, unsigned count EINA_UNUSED, - int64_t pts EINA_UNUSED) +_tmp_playing_event_cb(const struct libvlc_event_t *ev, void *data) { -} + App *app = data; -static void -_file_set(App *app) -{ - app->m = libvlc_media_new_path(app->libvlc, app->filename); - if (!app->m) - { - ERR("could not open path: \"%s\"", app->filename); - return; - } + if (ev->type != libvlc_MediaPlayerPlaying) + return; - app->mp = libvlc_media_player_new_from_media(app->m); - if (!app->mp) - { - ERR("could not create new player from media."); - return; - } + /* pause and stop listening the temporary event */ + libvlc_event_detach(app->event_mgr,libvlc_MediaPlayerPlaying, + _tmp_playing_event_cb, app); + libvlc_media_player_set_pause(app->mp, 1); + + /* sending size info */ + libvlc_video_get_size(app->mp, 0, &app->w, &app->h); + _send_resize(app, app->w, app->h); - app->opening = 1; - libvlc_video_set_format(app->mp, "RV32", DEFAULTWIDTH, DEFAULTHEIGHT, DEFAULTWIDTH * 4); - libvlc_video_set_callbacks(app->mp, _tmp_lock, _tmp_unlock, _tmp_display, app); - libvlc_video_set_format_callbacks(app->mp, _tmp_format, NULL); - /* On my system the mute below is not working and I can't find a way - to make it work, so the following set should help, but then it has - other side effect... - */ - /* libvlc_audio_set_callbacks(app->mp, _tmp_play, NULL, NULL, NULL, NULL, app); */ + /* sending total lenght */ + _send_length_changed(app); - app->event_mgr = libvlc_media_player_event_manager(app->mp); - libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerPositionChanged, - _event_cb, app); - libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerStopped, - _event_cb, app); + /* sending audio track info */ + _send_all_track_info(app); - app->mevent_mgr = libvlc_media_event_manager(app->m); + /* sending meta info */ + _send_all_meta_info(app); - app->tmpbuffer = malloc(sizeof(char) * DEFAULTWIDTH * DEFAULTHEIGHT * 4); - libvlc_audio_set_mute(app->mp, 1); - libvlc_media_player_play(app->mp); + /* ok, we are done! Now let emotion create the shmem for us */ + _send_file_set(app); } static void * @@ -421,82 +384,108 @@ app->vs->frame.player = app->vs->frame.next; app->vs->frame.next = app->vs->frame.last; if (!app->vs->frame_drop++) - _send_cmd(app, EM_RESULT_FRAME_NEW); + { + _send_cmd(app, EM_RESULT_FRAME_NEW); + _send_cmd_finish(app); + } eina_semaphore_release(&app->vs->lock, 1); } static void -_file_set_done(App *app) +_player_setup(App *app) { - int r; - - app->opening = 0; - - r = emotion_generic_shm_get(app->shmname, &app->vs, &app->vf); - if (!r) - { - free(app->filename); - libvlc_media_release(app->m); - libvlc_media_player_release(app->mp); - app->filename = NULL; - app->m = NULL; - app->mp = NULL; - - _send_cmd(app, EM_RESULT_FILE_SET_DONE); - SEND_CMD_PARAM(app, r); - } - app->w = app->vs->width; - app->h = app->vs->height; + libvlc_video_set_format(app->mp, "RV32", app->w, app->h, app->w * 4); libvlc_video_set_callbacks(app->mp, _lock, _unlock, _display, app); + app->event_mgr = libvlc_media_player_event_manager(app->mp); libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerPlaying, - _event_cb, app); + _event_cb, app); libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerTimeChanged, - _event_cb, app); + _event_cb, app); libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerLengthChanged, - _event_cb, app); + _event_cb, app); libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerSeekableChanged, - _event_cb, app); + _event_cb, app); libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerEndReached, _event_cb, app); - - libvlc_audio_set_mute(app->mp, 0); - - _send_cmd(app, EM_RESULT_FILE_SET_DONE); - SEND_CMD_PARAM(app, r); + libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerStopped, + _event_cb, app); } +/* Commands received from the emotion pipe */ static void -_file_close(App *app) +_file_set(App *app) { - app->playing = 0; - if (app->opening) - goto release_resources; + DBG("Path: %s", app->filename); + app->m = libvlc_media_new_path(app->libvlc, app->filename); + if (!app->m) + { + ERR("could not open path: \"%s\"", app->filename); + return; + } - if (libvlc_media_player_get_state(app->mp) != libvlc_Playing) + app->mp = libvlc_media_player_new_from_media(app->m); + if (!app->mp) { - _send_file_closed(app); + ERR("could not create new player from media."); return; } - app->closing = 1; + app->opening = EINA_TRUE; -release_resources: - libvlc_media_player_stop(app->mp); - if (app->filename) - free(app->filename); - if (app->mp) + /* Here we start playing and connect a temporary callback to know when + * the file is parsed and ready to be played for real. + */ + app->event_mgr = libvlc_media_player_event_manager(app->mp); + libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerPlaying, + _tmp_playing_event_cb, app); + + libvlc_media_player_play(app->mp); +} + +static void +_file_set_done(App *app) +{ + int r; + + DBG("Path: %s", app->filename); + app->opening = EINA_FALSE; + + r = emotion_generic_shm_get(app->shmname, &app->vs, &app->vf); + if (!r) { + free(app->filename); libvlc_media_release(app->m); libvlc_media_player_release(app->mp); - free(app->tmpbuffer); + app->filename = NULL; + app->m = NULL; + app->mp = NULL; + } + else + { + _player_setup(app); } + + _send_file_set_done(app, r); +} + +static void +_file_close(App *app) +{ + DBG("closing file"); + + if (!app->mp) + return; + + app->closing = EINA_TRUE; + libvlc_media_player_stop(app->mp); } static void _stop(App *app) { + DBG("Stop"); if (app->mp) libvlc_media_player_set_pause(app->mp, 1); } @@ -504,6 +493,8 @@ static void _play(App *app, float pos) { + DBG("Play at %.3f", pos); + if (!app->mp) return; @@ -520,25 +511,30 @@ if (app->subtitle_path) libvlc_video_set_subtitle_file(app->mp, app->subtitle_path); - app->playing = 1; + app->playing = EINA_TRUE; } } static void -_position_set(struct _App *app, float position) +_position_set(App *app, float position) { libvlc_time_t new_time; + DBG("Position set %.3f", position); if (!app->mp) return; new_time = position * 1000; libvlc_media_player_set_time(app->mp, new_time); + + if (libvlc_media_player_get_state(app->mp) == libvlc_Paused) + _send_time_changed(app); } static void _speed_set(App *app, float rate) { + DBG("Speed set %.3f", rate); if (!app->mp) return; @@ -548,40 +544,43 @@ static void _mute_set(App *app, int mute) { + DBG("Mute %d", mute); if (!app->mp) return; + app->audio_muted = mute; libvlc_audio_set_mute(app->mp, mute); } static void _volume_set(App *app, float volume) { - int vol; - + DBG("Volume set %.2f", volume); if (!app->mp) return; - vol = volume * 100; - - libvlc_audio_set_volume(app->mp, vol); + app->volume = volume * 100; + libvlc_audio_set_volume(app->mp, app->volume); } static void _spu_track_set(App *app, int track) { + DBG("SPU track %d", track); libvlc_video_set_spu(app->mp, track); } static void _audio_track_set(App *app, int track) { + DBG("Audio track %d", track); libvlc_audio_set_track(app->mp, track); } static void _video_track_set(App *app, int track) { + DBG("Video Track %d", track); libvlc_video_set_track(app->mp, track); } @@ -623,7 +622,7 @@ libvlc_media_release(app->m); libvlc_media_player_release(app->mp); free(app->filename); - app->opening = 0; + app->opening = EINA_FALSE; } break; case EM_CMD_FILE_SET_DONE: @@ -634,6 +633,10 @@ _file_close(app); app->last_order = EM_CMD_LAST; break; + case EM_CMD_STOP: + _stop(app); + app->last_order = EM_CMD_LAST; + break; } } else @@ -643,7 +646,7 @@ case EM_CMD_INIT: app->shmname = strdup(buffer); app->inited = EINA_TRUE; - _send_cmd(app, EM_RESULT_INIT); + _send_init(app); break; case EM_CMD_FILE_SET: app->filename = strdup(buffer); @@ -655,9 +658,6 @@ case EM_CMD_PLAY: _play(app, *(float*) buffer); break; - case EM_CMD_STOP: - _stop(app); - break; case EM_CMD_POSITION_SET: _position_set(app, *(float*) buffer); break; @@ -684,11 +684,20 @@ } } -void +static void _dummy(void *data EINA_UNUSED, void *buffer EINA_UNUSED, unsigned int nbyte EINA_UNUSED) { - /* This function is useless for the pipe we use to send message back to emotion, - but still needed */ + /* This function is useless for the pipe we use to send message back + to emotion, but still needed */ +} + +/* Main */ +Eina_Bool +exit_func(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) +{ + DBG("Quit signal received !"); + ecore_main_loop_quit(); + return EINA_TRUE; } int @@ -737,6 +746,8 @@ ecore_init(); + eina_lock_new(&app.cmd_mutex); + app.fd_read = ecore_pipe_full_add(_remote_command, &app, atoi(argv[1]), -1, EINA_FALSE, EINA_FALSE); app.fd_write = ecore_pipe_full_add(_dummy, NULL, @@ -750,22 +761,21 @@ app.subtitle_path = NULL; app.w = 0; app.h = 0; - app.size_sent = 0; - app.opening = 0; - app.playing = 0; - app.closing = 0; - app.last_order = EM_CMD_LAST; + app.opening = EINA_FALSE; + app.playing = EINA_FALSE; app.inited = EINA_FALSE; + app.last_order = EM_CMD_LAST; ecore_main_loop_begin(); libvlc_release(app.libvlc); - + ecore_pipe_del(app.fd_read); + ecore_pipe_del(app.fd_write); ecore_event_handler_del(hld); + eina_lock_free(&app.cmd_mutex); ecore_shutdown(); eina_shutdown(); - return 0; error: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dia for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at 2014-03-01 07:47:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dia (Old) and /work/SRC/openSUSE:Factory/.dia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dia" Changes: -------- --- /work/SRC/openSUSE:Factory/dia/dia.changes 2013-12-17 10:01:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2014-03-01 07:47:33.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 26 21:43:05 UTC 2014 - mgorse(a)suse.com + +- Remove libgnomeui support. Libgnomeui is deprecated, and session + management does not appear to be working well anyhow with GNOME 3. +- Remove help files from GNOME directories +- Add dia-enable-html-doc.patch -- always build html docs, as they + are needed for online help. Ie, don't require --with-hardbooks. + +------------------------------------------------------------------- New: ---- dia-enable-html-doc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.Cn6MOw/_old 2014-03-01 07:47:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Cn6MOw/_new 2014-03-01 07:47:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dia # -# 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 @@ -17,6 +17,7 @@ Name: dia +BuildRequires: docbook-toys BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gcc-c++ @@ -29,7 +30,6 @@ BuildRequires: libEMF-devel %endif %endif -BuildRequires: libgnomeui-devel BuildRequires: libtool BuildRequires: libxslt-devel BuildRequires: python-devel @@ -68,6 +68,8 @@ Patch21: dia-glib-2.35.patch # PATCH-FIX-UPSTREAM dia-use-recommended-freetype-include.patch bgo#720573 hrvoje.senjan(a)gmail.com -- Freetype upstream recommends using their macros together with ft2build include. Fix build with old and new freetype versions Patch22: dia-use-recommended-freetype-include.patch +# PATCH-FIX-OPENSUSE dia-enable-html-doc.patch mgorse(a)suse.com -- Always enable html docs if xsltproc present. +Patch23: dia-enable-html-doc.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang @@ -96,6 +98,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 cp $RPM_SOURCE_DIR/font-test*dia . %build @@ -104,7 +107,7 @@ %configure\ --disable-static\ --enable-db2html\ - --enable-gnome\ + --disable-gnome\ --with-python\ --with-cairo\ --with-swig @@ -114,10 +117,6 @@ %makeinstall find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + %suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart -# Workaround for bgo#581537: the C help is just a symlink to the en help. But -# find_lang doesn't like this -rm %{buildroot}%{_datadir}/gnome/help/dia/C -mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/dia/C %find_lang %{name} %{?no_lang_C} # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info @@ -141,13 +140,6 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/* %{_libdir}/dia %{_datadir}/applications/*.desktop ++++++ dia-enable-html-doc.patch ++++++ >From 9d0973e21955205c7b334a4447e2418e246aaeeb Mon Sep 17 00:00:00 2001 From: Mike Gorse <mgorse(a)linux-sh69.site> Date: Thu, 13 Feb 2014 18:44:37 -0600 Subject: [PATCH] Always enable html docs --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index bfca467..50bef62 100644 --- a/configure.in +++ b/configure.in @@ -602,7 +602,7 @@ hardbook_ok=no xsltproc_ok=no if test "x$with_hardbooks" = "xno"; then AM_CONDITIONAL(WITH_JW, test "xno" != "xno") - AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno") + AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno") AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno") AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno") else -- 1.8.5.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 dracut for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-03-01 07:46:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-02-16 19:47:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-03-01 07:46:58.000000000 +0100 @@ -1,0 +2,36 @@ +Thu Feb 27 14:08:56 UTC 2014 - trenn(a)suse.de + +- Make sure that --add-drivers is not called with whitespace string which + will lead to a "read line" user input request and things may get stuck at + installation. + - Add: dracut-fix-whitespace-add-drivers_call.patch +- Remove s390 grub module again -> this will go into grub2 package + (ask rw(a)suse.de for details) + Delete/remove: s390_add-user-space-grub-rule.patch +- Add installkernel script which installs the kernel when: + make install + is invoked. The script from mkinitrd has been taken over and adopted. + Added source: dracut-installkernel + bnc#862990 + +------------------------------------------------------------------- +Fri Feb 21 14:56:20 UTC 2014 - trenn(a)suse.de + +- Fix syntax error -> missing then +- Correct path, it is /usr/bin/grub2-emu + +------------------------------------------------------------------- +Mon Feb 17 18:51:58 UTC 2014 - trenn(a)suse.de + +- autofs4 is always included since mainline git commit: 314929920f27448b45bfd + systemd: ensure autofs4 and ipv6 are included +- Always add network and iscsi dracut module, so that ibft, iscsi, nfsroot + work as expected. + +------------------------------------------------------------------- +Fri Feb 14 14:02:52 UTC 2014 - pwieczorkiewicz(a)suse.com + +- change_write_ifcfg_to_suse.patch: + Detect the system flavor and write the ifcfg files accordingly. + +------------------------------------------------------------------- Old: ---- s390_add-user-space-grub-rule.patch New: ---- change_write_ifcfg_to_suse.patch dracut-fix-whitespace-add-drivers_call.patch dracut-installkernel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.jjHpWD/_old 2014-03-01 07:47:00.000000000 +0100 +++ /var/tmp/diff_new_pack.jjHpWD/_new 2014-03-01 07:47:00.000000000 +0100 @@ -33,6 +33,7 @@ Source3: mkinitrd_setup_dummy Source4: purge-kernels Source5: purge-kernels.service +Source6: dracut-installkernel Patch10: 0006-Install-bin-mount.patch Patch11: 0013-Correct-paths-for-openSUSE.patch Patch12: 0014-Check-for-plymouth-lib-directories.patch @@ -41,8 +42,9 @@ Patch15: replace_dhclient_with_wickedd_dhcp_supplicants.patch Patch16: fix-iscsi-firmware.patch Patch17: remove-iscsiuio.patch -Patch18: s390_add-user-space-grub-rule.patch -Patch19: 0015-add-new-s390x-specific-rule-files.patch +Patch18: 0015-add-new-s390x-specific-rule-files.patch +Patch19: change_write_ifcfg_to_suse.patch +Patch20: dracut-fix-whitespace-add-drivers_call.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -65,9 +67,6 @@ Requires: udev > 166 Requires: util-linux >= 2.21 Requires: xz -%ifarch s390x -Requires: grub2 -%endif Recommends: binutils Recommends: logrotate Obsoletes: mkinitrd < 2.8.2 @@ -123,6 +122,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build %configure\ @@ -164,7 +164,7 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf -echo 'add_drivers+="autofs4"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf +echo 'add_dracutmodules+="network iscsi"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf %ifarch %ix86 x86_64 echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf @@ -182,7 +182,13 @@ install -D -m 0755 %{SOURCE4} %{buildroot}/sbin/purge-kernels install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/purge-kernels.service -chmod 755 %{buildroot}/%{dracutlibdir}/modules.d/95grub2/* +install -D -m 0755 %{SOURCE6} %{buildroot}/sbin/installkernel + +%if 0%{?suse_version} +ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-suse.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh +%else +ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh +%endif %pre %service_add_pre purge-kernels.service @@ -195,6 +201,7 @@ %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut /sbin/purge-kernels +/sbin/installkernel /sbin/mkinitrd /sbin/mkinitrd_setup %{_bindir}/lsinitrd @@ -269,7 +276,6 @@ %{dracutlibdir}/modules.d/95dasd_mod %{dracutlibdir}/modules.d/95dasd_rules %{dracutlibdir}/modules.d/95fstab-sys -%{dracutlibdir}/modules.d/95grub2 %{dracutlibdir}/modules.d/95zfcp %{dracutlibdir}/modules.d/95zfcp_rules %{dracutlibdir}/modules.d/95terminfo ++++++ change_write_ifcfg_to_suse.patch ++++++ ++++ 769 lines (skipped) ++++++ dracut-fix-whitespace-add-drivers_call.patch ++++++ Index: dracut-036/mkinitrd-suse.sh =================================================================== --- dracut-036.orig/mkinitrd-suse.sh +++ dracut-036/mkinitrd-suse.sh @@ -70,10 +70,7 @@ usage () { $cmd " -j device Journal device" $cmd " -D interface Run dhcp on the specified interface." $cmd " -I interface Configure the specified interface statically." - $cmd " -a acpi_dsdt Attach compiled ACPI DSDT (Differentiated" - $cmd " System Description Table) to initrd. This" - $cmd " replaces the DSDT of the BIOS. Defaults to" - $cmd " the ACPI_DSDT variable in /etc/sysconfig/kernel." + $cmd " -a acpi_dsdt Obsolete, do not use." $cmd " -s size Add splash animation and bootscreen to initrd." [[ $1 = '-n' ]] && exit 0 @@ -310,11 +307,10 @@ if [ -f /etc/sysconfig/kernel ] ; then . /etc/sysconfig/kernel fi [[ $module_list ]] || module_list="${INITRD_MODULES}" -basicmodules="$basicmodules ${module_list}" [[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}" -[[ $acpi_dsdt ]] || acpi_dsdt="${ACPI_DSDT}" +shopt -s extglob -echo "Creating: target|kernel|dracut args|basicmodules " +echo "Creating: target|kernel|dracut args " for ((i=0 ; $i<${#targets[@]} ; i++)); do if [[ $img_vers ]];then @@ -324,28 +320,30 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d fi kernel="${kernels[$i]}" + if is_xen_kernel $kernel $rootfs ; then + modules_all="${module_list} ${domu_module_list}" + else + modules_all="${module_list}" + fi + + # Remove leading and trailing spaces needs (set above): shopt -s extglob + modules_all=${modules_all%%+([[:space:]])} + modules_all=${modules_all##+([[:space:]])} + if [ -n "${modules_all}" ];then + dracut_args_all="$dracut_args --add-drivers \"${modules_all}\"" + else + dracut_args_all="$dracut_args" + fi + # Duplicate code: No way found how to redirect output based on $quiet if [[ $quiet == 1 ]];then - echo "$target|$kernel|$dracut_args|$basicmodules" + echo "$target|$kernel|$dracut_args_all" if is_xen_kernel $kernel $rootfs ; then basicmodules="$basicmodules ${domu_module_list}" fi - if [[ $basicmodules ]]; then - $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ - "$kernel" &>/dev/null - else - $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null - fi + $dracut_cmd $dracut_args_all "$target" "$kernel" &>/dev/null else - if is_xen_kernel $kernel $rootfs ; then - basicmodules="$basicmodules ${domu_module_list}" - fi - if [[ $basicmodules ]]; then - $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ - "$kernel" - else - $dracut_cmd $dracut_args "$target" "$kernel" - fi + $dracut_cmd $dracut_args_all "$target" "$kernel" fi done ++++++ dracut-installkernel ++++++ #! /bin/sh # # /sbin/installkernel - written by tyson(a)rwii.com # # May 21, 2003 - agruen(a)suse.de # * Adapted for SuSE and cleaned up. # # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/installkernel,v $ # $Revision: 1.8 $ # : ${INSTALL_PATH:=/boot} KERNEL_VERSION=$1 BOOTIMAGE=$2 MAPFILE=$3 case "$(uname -m)" in s390|s390x) BOOTFILE=image ;; ppc|ppc64) BOOTFILE=vmlinux ;; *) BOOTFILE=vmlinuz ;; esac # # Move away files from versions up to SuSE Linux 8.2 # if [ -f $INSTALL_PATH/$BOOTFILE -a ! -L $INSTALL_PATH/$BOOTFILE ]; then mv $INSTALL_PATH/$BOOTFILE $INSTALL_PATH/$BOOTFILE.old fi if [ -L $INSTALL_PATH/System.map ]; then rm -f $INSTALL_PATH/System.map elif [ -f $INSTALLPATH/System.map ]; then mv $INSTALL_PATH/System.map $INSTALL_PATH/System.map.old fi # # Move away files from after SuSE Linux 8.2 # if [ -f $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION ]; then mv $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION \ $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION.old; fi if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then mv $INSTALL_PATH/System.map-$KERNEL_VERSION \ $INSTALL_PATH/System.map-$KERNEL_VERSION.old; fi # # Install new files # cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION KERNTYPES=$(dirname $MAPFILE)/init/kerntypes.o if [ -e $KERNTYPES ]; then cp -fp $KERNTYPES $INSTALL_PATH/Kerntypes-$KERNEL_VERSION fi case "$(uname -m)" in i?86 | x86_64) KERNBIN=$(dirname $MAPFILE)/vmlinux if [ -e $KERNBIN ]; then if [ -f $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz ]; then mv $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz \ $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz.old; fi gzip -c $KERNBIN > $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz fi ;; esac if [ ! -d /lib/modules/$KERNEL_VERSION ];then make modules_install fi # # Generate initial ramdisk # if [ -x /usr/bin/dracut -a -d /lib/modules/$KERNEL_VERSION ]; then /usr/bin/dracut --hostonly --force $INSTALL_PATH/initrd-$KERNEL_VERSION else echo "You may need to create an initial ramdisk now." fi # # Update boot loader # if [ -x /sbin/update-bootloader ]; then opt_initrd= [ -e $INSTALL_PATH/initrd-$KERNEL_VERSION ] \ && opt_initrd="--initrd $INSTALL_PATH/initrd-$KERNEL_VERSION" /sbin/update-bootloader --name $KERNEL_VERSION \ --image $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION \ $opt_initrd --add --force fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0