openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2019
- 1 participants
- 2390 discussions
Hello community,
here is the log from the commit of package tiled for openSUSE:Factory checked in at 2019-11-30 10:37:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tiled (Old)
and /work/SRC/openSUSE:Factory/.tiled.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tiled"
Sat Nov 30 10:37:01 2019 rev:17 rq:749935 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/tiled/tiled.changes 2019-05-22 15:41:00.142432469 +0200
+++ /work/SRC/openSUSE:Factory/.tiled.new.26869/tiled.changes 2019-11-30 10:37:49.064169045 +0100
@@ -1,0 +2,74 @@
+Wed Nov 20 14:38:27 UTC 2019 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 1.3.1:
+ * Added reloading of object types when changed externally (by Jacob Coughenour, #2674)
+ * Added a status bar to the startup screen
+ * Made the shortcuts for the tools configurable (#2666)
+ * Made Undo/Redo shortcuts configurable (#2669)
+ * Fixed importing of keyboard settings (.kms files) (#2671)
+ * Fixed small window showing up on startup for a split second
+ * Windows: Fixed the shipped version of OpenSSL (fixes new version notification)
+ * Tiled Quick: Don't compile/install by default (#2673)
+- Remove tiled-1.3.0-disable-quick.patch: upstreamed
+
+-------------------------------------------------------------------
+Thu Nov 14 10:51:33 UTC 2019 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 1.3.0:
+ * Added support for extending Tiled with JavaScript (#949)
+ * Added error and warning counts to the status bar
+ * Added Issues view where you can see warnings and errors and interact with them
+ * Added configuration of keyboard shortcuts (#215)
+ * Added status bar notification on new releases (replacing Sparkle and WinSparkle)
+ * Added option to show tile collision shapes on the map (#799)
+ * Added switching current layer with Ctrl + Right Click in map view
+ * Added search filter to the Objects view (#1467)
+ * Added icons to objects in the Objects view
+ * Added dynamic wrapping mode to the tileset view (#1241)
+ * Added a *.world file filter when opening a world file
+ * Added support for .world files in tmxrasterizer (by Samuel Magnan, #2067)
+ * Added synchronization of selected layers and tileset when switching between maps in a world (by JustinZhengBC, #2087)
+ * Added actions to show/hide and lock/unlock the selected layers
+ * Added toggle button for "Highlight Current Layer" action
+ * Added custom output chunk size option to map properties (by Markus, #2130)
+ * Added support for Zstandard compression and configurable compression level (with BRULE Herman and Michael de Lang, #1888)
+ * Added option to minimize output on export (#944)
+ * Added export to Defold .collection files (by CodeSpartan, #2084)
+ * Added a warning when custom file properties point to non-existing files (#2080)
+ * Added shortcuts for next/previous tileset (#1238)
+ * Added saving of the last export target and format in the map/tileset file (#1610)
+ * Added option to repeat the last export on save (#1610)
+ * Added Fit Map in View action (by Mateo de Mayo, #2206)
+ * Tile Collision Editor: Added objects list view
+ * Changed the Type property from a text box to an editable combo box (#823)
+ * Changed animation preview to follow zoom factor for tiles (by Ruslan Gainutdinov, #2050)
+ * Changed the shortcut for AutoMap from A to Ctrl+M
+ * AutoMapping: Added "OverflowBorder" and "WrapBorder" options (by João Baptista de Paula e Silva, #2141)
+ * AutoMapping: Allow any supported map format to be used for rule maps
+ * Python plugin: Added support for loading external tileset files (by Ruin0x11, #2085)
+ * Python plugin: Added Tile.type() and MapObject.effectiveType() (by Ruin0x11, #2124)
+ * Python plugin: Added Object.propertyType() (by Ruin0x11, #2125)
+ * Python plugin: Added Tileset.sharedPointer() function (#2191)
+ * tmxrasterizer: Load plugins to support additional map formats (by Nathan Tolbert, #2152)
+ * tmxrasterizer: Added rendering of object layers (by oncer, #2187)
+ * Fixed missing native styles when compiled against Qt 5.10 or later (#1977)
+ * Fixed file change notifications no longer triggering when file was replaced (by Nathan Tolbert, #2158)
+ * Fixed layer IDs getting re-assigned when resizing the map (#2160)
+ * Fixed performance issues when switching to a new map in a world with many maps (by Simon Parzer, #2159)
+ * Fixed restoring of expanded group layers in Objects view
+ * Fixed tileset view to keep position at mouse stable when zooming (#2039)
+ * libtiled-java: Added support for image layers and flipped tiles (by Sergey Savchuk, #2006)
+ * libtiled-java: Optimized map reader and fixed path separator issues (by Pavel Bondoronok, #2006)
+ * Updated builds on all platforms to Qt 5.12 (except snap release)
+ * Raised minimum supported Qt version from 5.5 to 5.6
+ * Raised minimum supported macOS version from 10.7 to 10.12
+ * Removed option to include a DTD in the saved files
+ * Removed the automappingconverter tool
+ * snap: Updated from Ubuntu 16.04 to 18.04 (core18, Qt 5.9)
+ * Updated Chinese, Portuguese (Portugal), Turkish and Ukrainian translations
+- Add tiled-1.3.0-disable-quick.patch:
+ Disable build tiledquick and tiledquickplugin as they are not useful yet.
+ And they cause trouble because they get installed to the wrong location.
+ They will be disabled upstream in 1.3.1 too.
+
+-------------------------------------------------------------------
Old:
----
tiled-1.2.4.tar.gz
New:
----
tiled-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tiled.spec ++++++
--- /var/tmp/diff_new_pack.yaww3a/_old 2019-11-30 10:37:50.208168907 +0100
+++ /var/tmp/diff_new_pack.yaww3a/_new 2019-11-30 10:37:50.212168907 +0100
@@ -12,17 +12,16 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: tiled
-Version: 1.2.4
+Version: 1.3.1
Release: 0
Summary: A tilemap editor
License: GPL-2.0-or-later
-Group: Productivity/Graphics/Other
-Url: http://www.mapeditor.org
+URL: https://www.mapeditor.org
Source: https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar…
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -33,6 +32,7 @@
BuildRequires: libqt5-qtbase-devel
BuildRequires: shared-mime-info
BuildRequires: zlib-devel
+BuildRequires: cmake(Qt5Qml)
Recommends: tmxtools
Provides: tiled-qt
@@ -45,7 +45,6 @@
%package -n tmxtools
Summary: Commandline Tools for Tiled MapEditor
License: BSD-2-Clause
-Group: Productivity/Graphics/Other
%description -n tmxtools
This package contains tmxviewer, a simple application to view Tiled maps
@@ -54,7 +53,6 @@
%package -n libtiled1
Summary: Library for Tiled MapEditor
License: BSD-2-Clause
-Group: Development/Libraries/C and C++
%description -n libtiled1
This package contains libtiled a library for the Tiled map editor.
@@ -100,7 +98,8 @@
%endif
%files -f %{name}.lang
-%doc AUTHORS NEWS.md README.md COPYING LICENSE.GPL LICENSE.BSD
+%license COPYING LICENSE.GPL LICENSE.BSD
+%doc AUTHORS NEWS.md README.md
%{_bindir}/%{name}
%{_bindir}/terraingenerator
%{_datadir}/applications/org.mapeditor.Tiled.desktop
@@ -111,20 +110,18 @@
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/translations
%{_libdir}/%{name}
-%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
%files -n libtiled1
-%doc LICENSE.BSD
+%license LICENSE.BSD
%{_libdir}/lib%{name}.so.*
%files -n tmxtools
-%doc LICENSE.BSD
-%{_bindir}/automappingconverter
+%license LICENSE.BSD
%{_bindir}/tmxrasterizer
%{_bindir}/tmxviewer
-%{_mandir}/man1/tmxviewer.1%{ext_man}
-%{_mandir}/man1/tmxrasterizer.1%{ext_man}
-%{_mandir}/man1/automappingconverter.1%{ext_man}
+%{_mandir}/man1/tmxviewer.1%{?ext_man}
+%{_mandir}/man1/tmxrasterizer.1%{?ext_man}
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/tiled.thumbnailer
%dir %{_datadir}/metainfo/
++++++ tiled-1.2.4.tar.gz -> tiled-1.3.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/tiled/tiled-1.2.4.tar.gz /work/SRC/openSUSE:Factory/.tiled.new.26869/tiled-1.3.1.tar.gz differ: char 12, line 1
1
0
Hello community,
here is the log from the commit of package kstars for openSUSE:Factory checked in at 2019-11-30 10:36:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kstars (Old)
and /work/SRC/openSUSE:Factory/.kstars.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kstars"
Sat Nov 30 10:36:56 2019 rev:108 rq:749308 version:3.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2019-09-10 00:00:31.133219467 +0200
+++ /work/SRC/openSUSE:Factory/.kstars.new.26869/kstars.changes 2019-11-30 10:37:44.072169644 +0100
@@ -1,0 +2,45 @@
+Mon Nov 18 10:50:59 UTC 2019 - wbauer(a)tmo.at
+
+- Update to 3.3.8
+ * Fix dome status for rolloff dome when sending status messages
+ * Disable the move to polar message action and just display it as
+ a message instead to alert the user
+ * Fix another crash in poly plotting. Check if array is empty
+ * Adding the polynomial and focus position to the focus graph as
+ well as tooltips
+ * Fix incorrect labels
+ * Use backend instead of type to avoid confusion
+ * Add solver and astrometry solver types
+ * Add error dialog if ASTAP is not found and open options dialog
+ automatically after that
+ * Solve crashing in creating WCS file and use simpler WCS update
+ * Fix condition where previous values of solver type can cause
+ crash in the 3.3.7 version
+
+-------------------------------------------------------------------
+Sat Nov 9 08:23:55 UTC 2019 - wbauer(a)tmo.at
+
+- Update to 3.3.7
+ * http://knro.blogspot.com/2019/11/kstars-v337-released.html
+ * New ASTAP integration in the Align module
+ * Observatory module: added a dedicated weather widget with live
+ plotting for each parameter
+ * Further improvements to the FITS loading mechanism which
+ resulted in speed ups during sequence capturing
+ * Fixed HFR calculation in the FITS Data class
+ * Two new Ekos options (dusk and dawn offsets), located in the
+ Scheduler option pane
+ * Some improvements to PHD2 integration with Ekos
+ * Added download time estimation to the capture module
+ * Solved several issues with guiding & dithering in both capture
+ & scheduling
+ * Fixed gain setting in capture module
+ * Fixed focus HFR-averaging issue
+ * Connect Scheduler sleep timer to Simulation Clock scale change
+ * Handling of aborts during parking/unparking of rolloff roofs
+ corrected
+ * Hitting a constraint sets a job to IDLE instead of COMPLETE so
+ that it might be restarted later
+ * Update OpenNGC to v20191019
+
+-------------------------------------------------------------------
Old:
----
kstars-3.3.6.tar.xz
New:
----
kstars-3.3.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kstars.spec ++++++
--- /var/tmp/diff_new_pack.pqnnwk/_old 2019-11-30 10:37:46.016169411 +0100
+++ /var/tmp/diff_new_pack.pqnnwk/_new 2019-11-30 10:37:46.020169410 +0100
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kstars
-Version: 3.3.6
+Version: 3.3.8
Release: 0
Summary: Desktop Planetarium
# Note for legal: the Apache licensed files in the tarball are for the
++++++ kstars-3.3.6.tar.xz -> kstars-3.3.8.tar.xz ++++++
/work/SRC/openSUSE:Factory/kstars/kstars-3.3.6.tar.xz /work/SRC/openSUSE:Factory/.kstars.new.26869/kstars-3.3.8.tar.xz differ: char 26, line 1
1
0
Hello community,
here is the log from the commit of package wcslib for openSUSE:Factory checked in at 2019-11-30 10:36:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wcslib (Old)
and /work/SRC/openSUSE:Factory/.wcslib.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wcslib"
Sat Nov 30 10:36:47 2019 rev:5 rq:747258 version:6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/wcslib/wcslib.changes 2018-12-04 20:56:05.648734960 +0100
+++ /work/SRC/openSUSE:Factory/.wcslib.new.26869/wcslib.changes 2019-11-30 10:37:22.704172211 +0100
@@ -1,0 +2,52 @@
+Sun Nov 10 14:53:23 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- Update to version 6.4 (2019/08/15):
+ * Installation
+ - The rule change to the Fortran makefile in v6.3 to add getwcstab_f.o
+ to the sharable library causes it to depend on CFITSIO to resolve
+ fits_get_wcstab(). Hence backed out of that change.
+ * User manual
+ - Documentation generation moved to doxygen 1.8.16 (was 1.8.14).
+- Update to version 6.3 (2019/07/12)
+ * C library
+ - Fixed the Polynomial and TPD distortions so that, as stipulated in
+ WCS Paper IV, they are now considered to return an additive
+ correction to be applied to the given coordinates, rather than the
+ corrected coordinates themselves.
+ Added a new subsection to the prologue of dis.h entitled 'Historical
+ idiosyncrasies', which discusses this issue and other vagueries.
+ Amended components of the test suite accordingly: SIPTPV.keyrec,
+ TPV7.keyrec, and tdis1.c.
+ - Fixed memory leaks and other potential problems that arose in the
+ wcserr system consequent on changes made in release 6.1.
+ Memory allocated by wcsfixi() for messages in the array of wcserr
+ structs must now be freed by the caller. Amended twcsfix.c
+ accordingly.
+ - Plugged memory leaks arising in disset().
+ - New function wcsdealloc() provided to free memory allocated within
+ certain WCSLIB routines. Suggested by David Motl.
+ - Eliminated a swag of inconsequential compiler warnings, particularly
+ those emanating from the flex sources.
+ * Validation
+ - The library, Fortran wrappers, utilities, and test programs now pass
+ runtime analysis using -fsanitize=address and -fsanitize=undefined
+ in gcc 8.3.0, in addition to valgrind. Also compile-time strictures
+ using -std=c99, -pedantic, -Wall, -Wextra, and -DFORTIFY_SOURCE=2.
+ Prompted by feedback from Ole Streicher.
+ * Installation
+ - The non-graphical tests now run reliably in parallel builds
+ (make CHECK=nopgplot -j8 check). Requested by Mohammed Akhlaghi.
+ The graphical tests can also be run in parallel, but as PGPLOT can
+ only handle one stream at a time, some graphics are likely to be
+ lost. Nevertheless, it is a useful option, especially with runtime
+ analysis via -fsanitize=address, etc.
+ - As CFITSIO doesn't provide a Fortran wrapper for fits_read_wcstab(),
+ getwcstab_f.o is now always included in the WCSLIB object library
+ and sharable library if CFITSIO is available (and the WCSLIB Fortran
+ wrappers are required). Use 'configure --without-cfitsio' to
+ defeat this.
+ - Tidied up some aspects of the build where CFITSIO is not available.
+ * User manual
+ - Fixed minor formatting problems in dis.h.
+
+-------------------------------------------------------------------
Old:
----
wcslib-6.2.tar.bz2
New:
----
wcslib-6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wcslib.spec ++++++
--- /var/tmp/diff_new_pack.KV9Bc7/_old 2019-11-30 10:37:24.864171951 +0100
+++ /var/tmp/diff_new_pack.KV9Bc7/_new 2019-11-30 10:37:24.868171951 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wcslib
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define libver 6
Name: wcslib
-Version: 6.2
+Version: 6.4
Release: 0
Summary: An implementation of the FITS WCS standard
License: LGPL-3.0-or-later
@@ -87,8 +87,7 @@
%build
%configure --docdir=%{_docdir}/%{name} --without-pgplot
-# Sometimes %%{?_smp_mflags} make compilation fail, so don't use it
-make
+%make_build
%install
%make_install
++++++ wcslib-6.2.tar.bz2 -> wcslib-6.4.tar.bz2 ++++++
++++ 47656 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package pcre2 for openSUSE:Factory checked in at 2019-11-30 10:36:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcre2 (Old)
and /work/SRC/openSUSE:Factory/.pcre2.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcre2"
Sat Nov 30 10:36:06 2019 rev:16 rq:751375 version:10.34
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcre2/pcre2.changes 2019-05-03 22:25:37.888116799 +0200
+++ /work/SRC/openSUSE:Factory/.pcre2.new.26869/pcre2.changes 2019-11-30 10:37:01.924174707 +0100
@@ -1,0 +2,26 @@
+Tue Nov 26 21:24:43 UTC 2019 - Andreas Schwab <schwab(a)suse.de>
+
+- Enable JIT on aarch64
+
+-------------------------------------------------------------------
+Fri Nov 22 19:55:35 UTC 2019 - Andreas Stieger <andreas.stieger(a)gmx.de>
+
+- pcre2 10.34:
+ * implement the documented maximum number of capturing
+ subpatterns of 65535
+ * Improve the invalid utf32 support of the JIT compiler
+ * Add support for matching in invalid UTF strings to the pcre2_match()
+ * Give more error detail for invalid UTF-8 when detected in pcre2grep
+ * support for invalid UTF-8 to pcre2grep.
+ * Adjust the limit for "must have" code unit searching, in particular,
+ * increase it substantially for non-anchored patterns.
+ * Allow (*ACCEPT) to be quantified, because an ungreedy quantifier
+ with a zero minimum is potentially useful.
+ * Some changes to the way the minimum subject length is handled
+ * Check for integer overflow when computing lookbehind lengths
+ * Implement non-atomic positive lookaround assertions
+ * Upgraded to Unicode 12.1.0
+ * Make pcre2test -C show if libreadline or libedit is supported
+ * Various bug fixes and improvements
+
+-------------------------------------------------------------------
Old:
----
pcre2-10.33.tar.bz2
pcre2-10.33.tar.bz2.sig
New:
----
pcre2-10.34.tar.bz2
pcre2-10.34.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcre2.spec ++++++
--- /var/tmp/diff_new_pack.osW1Ze/_old 2019-11-30 10:37:02.616174624 +0100
+++ /var/tmp/diff_new_pack.osW1Ze/_new 2019-11-30 10:37:02.620174623 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pcre2
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: pcre2
-Version: 10.33
+Version: 10.34
Release: 0
Summary: A library for Perl-compatible regular expressions
License: BSD-3-Clause
@@ -174,7 +174,7 @@
autoreconf -fiv
export LDFLAGS="-Wl,-z,relro,-z,now"
%configure \
-%ifarch %{ix86} x86_64 %{arm} ppc ppc64 ppc64le mips sparc
+%ifarch %{ix86} x86_64 aarch64 %{arm} ppc ppc64 ppc64le mips sparc
--enable-jit \
--enable-jit-sealloc \
%endif
++++++ pcre2-10.33.tar.bz2 -> pcre2-10.34.tar.bz2 ++++++
++++ 36912 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ffnvcodec for openSUSE:Factory checked in at 2019-11-30 10:36:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffnvcodec (Old)
and /work/SRC/openSUSE:Factory/.ffnvcodec.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffnvcodec"
Sat Nov 30 10:36:02 2019 rev:8 rq:750896 version:9.1.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffnvcodec/ffnvcodec.changes 2019-06-27 15:52:42.651871980 +0200
+++ /work/SRC/openSUSE:Factory/.ffnvcodec.new.26869/ffnvcodec.changes 2019-11-30 10:36:54.596175587 +0100
@@ -1,0 +2,8 @@
+Tue Nov 26 03:51:19 UTC 2019 - Martin Herkt <9+suse(a)cirno.systems>
+
+- Update to version 9.1.23.0
+ * Add cuCtxGetDevice
+ * Use pointer-to-struct typedefs for pointer-to-struct types
+ * Update headers from Video SDK 9.1 release
+
+-------------------------------------------------------------------
Old:
----
nv-codec-headers-9.0.18.1.tar.xz
New:
----
nv-codec-headers-9.1.23.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffnvcodec.spec ++++++
--- /var/tmp/diff_new_pack.GjpT33/_old 2019-11-30 10:36:56.100175407 +0100
+++ /var/tmp/diff_new_pack.GjpT33/_new 2019-11-30 10:36:56.104175406 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ffnvcodec
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ffnvcodec
-Version: 9.0.18.1
+Version: 9.1.23.0
Release: 0
Summary: FFmpeg version of NVIDIA codec API headers
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.GjpT33/_old 2019-11-30 10:36:56.128175403 +0100
+++ /var/tmp/diff_new_pack.GjpT33/_new 2019-11-30 10:36:56.128175403 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">n([0-9\.]*)</param>
- <param name="revision">n9.0.18.1</param>
+ <param name="revision">n9.1.23.0</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ nv-codec-headers-9.0.18.1.tar.xz -> nv-codec-headers-9.1.23.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/README new/nv-codec-headers-9.1.23.0/README
--- old/nv-codec-headers-9.0.18.1/README 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/README 2019-09-23 16:03:27.000000000 +0200
@@ -1,7 +1,7 @@
FFmpeg version of headers required to interface with Nvidias codec APIs.
-Corresponds to Video Codec SDK version 9.0.18.
+Corresponds to Video Codec SDK version 9.1.23.
Minimum required driver versions:
-Linux: 418.30 or newer
-Windows: 418.81 or newer
+Linux: 435.21 or newer
+Windows: 436.15 or newer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/ffnvcodec.pc.in new/nv-codec-headers-9.1.23.0/ffnvcodec.pc.in
--- old/nv-codec-headers-9.0.18.1/ffnvcodec.pc.in 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/ffnvcodec.pc.in 2019-09-23 16:03:27.000000000 +0200
@@ -3,5 +3,5 @@
Name: ffnvcodec
Description: FFmpeg version of Nvidia Codec SDK headers
-Version: 9.0.18.1
+Version: 9.1.23.0
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_cuda.h new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_cuda.h
--- old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_cuda.h 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_cuda.h 2019-09-23 16:03:27.000000000 +0200
@@ -41,22 +41,23 @@
#define CU_CTX_SCHED_BLOCKING_SYNC 4
typedef int CUdevice;
-typedef void* CUarray;
-typedef void* CUcontext;
-typedef void* CUstream;
-typedef void* CUevent;
-typedef void* CUfunction;
-typedef void* CUmodule;
-typedef void* CUtexObject;
-typedef void* CUmipmappedArray;
-typedef void* CUgraphicsResource;
-typedef void* CUexternalMemory;
-typedef void* CUexternalSemaphore;
#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__LP64__)
typedef unsigned long long CUdeviceptr;
#else
typedef unsigned int CUdeviceptr;
#endif
+typedef unsigned long long CUtexObject;
+
+typedef struct CUarray_st *CUarray;
+typedef struct CUctx_st *CUcontext;
+typedef struct CUstream_st *CUstream;
+typedef struct CUevent_st *CUevent;
+typedef struct CUfunc_st *CUfunction;
+typedef struct CUmod_st *CUmodule;
+typedef struct CUmipmappedArray_st *CUmipmappedArray;
+typedef struct CUgraphicsResource_st *CUgraphicsResource;
+typedef struct CUextMemory_st *CUexternalMemory;
+typedef struct CUextSemaphore_st *CUexternalSemaphore;
typedef enum cudaError_enum {
CUDA_SUCCESS = 0,
@@ -329,6 +330,7 @@
typedef CUresult CUDAAPI tcuMemcpy2DAsync_v2(const CUDA_MEMCPY2D *pcopy, CUstream hStream);
typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char** pstr);
typedef CUresult CUDAAPI tcuGetErrorString(CUresult error, const char** pstr);
+typedef CUresult CUDAAPI tcuCtxGetDevice(CUdevice *device);
typedef CUresult CUDAAPI tcuStreamCreate(CUstream *phStream, unsigned int flags);
typedef CUresult CUDAAPI tcuStreamQuery(CUstream hStream);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_cuviddec.h new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_cuviddec.h
--- old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_cuviddec.h 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_cuviddec.h 2019-09-23 16:03:27.000000000 +0200
@@ -42,7 +42,7 @@
#endif
#define NVDECAPI_MAJOR_VERSION 9
-#define NVDECAPI_MINOR_VERSION 0
+#define NVDECAPI_MINOR_VERSION 1
#define NVDECAPI_VERSION (NVDECAPI_MAJOR_VERSION | (NVDECAPI_MINOR_VERSION << 24))
@@ -158,20 +158,21 @@
/**************************************************************************************************************/
typedef struct _CUVIDDECODECAPS
{
- cudaVideoCodec eCodecType; /**< IN: cudaVideoCodec_XXX */
- cudaVideoChromaFormat eChromaFormat; /**< IN: cudaVideoChromaFormat_XXX */
- unsigned int nBitDepthMinus8; /**< IN: The Value "BitDepth minus 8" */
- unsigned int reserved1[3]; /**< Reserved for future use - set to zero */
-
- unsigned char bIsSupported; /**< OUT: 1 if codec supported, 0 if not supported */
- unsigned char reserved2[3]; /**< Reserved for future use - set to zero */
- unsigned int nMaxWidth; /**< OUT: Max supported coded width in pixels */
- unsigned int nMaxHeight; /**< OUT: Max supported coded height in pixels */
+ cudaVideoCodec eCodecType; /**< IN: cudaVideoCodec_XXX */
+ cudaVideoChromaFormat eChromaFormat; /**< IN: cudaVideoChromaFormat_XXX */
+ unsigned int nBitDepthMinus8; /**< IN: The Value "BitDepth minus 8" */
+ unsigned int reserved1[3]; /**< Reserved for future use - set to zero */
+
+ unsigned char bIsSupported; /**< OUT: 1 if codec supported, 0 if not supported */
+ unsigned char reserved2; /**< Reserved for future use - set to zero */
+ unsigned short nOutputFormatMask; /**< OUT: each bit represents corresponding cudaVideoSurfaceFormat enum */
+ unsigned int nMaxWidth; /**< OUT: Max supported coded width in pixels */
+ unsigned int nMaxHeight; /**< OUT: Max supported coded height in pixels */
unsigned int nMaxMBCount; /**< OUT: Max supported macroblock count
- CodedWidth*CodedHeight/256 must be <= nMaxMBCount */
- unsigned short nMinWidth; /**< OUT: Min supported coded width in pixels */
- unsigned short nMinHeight; /**< OUT: Min supported coded height in pixels */
- unsigned int reserved3[11]; /**< Reserved for future use - set to zero */
+ CodedWidth*CodedHeight/256 must be <= nMaxMBCount */
+ unsigned short nMinWidth; /**< OUT: Min supported coded width in pixels */
+ unsigned short nMinHeight; /**< OUT: Min supported coded height in pixels */
+ unsigned int reserved3[11]; /**< Reserved for future use - set to zero */
} CUVIDDECODECAPS;
/**************************************************************************************************************/
@@ -189,7 +190,7 @@
tcu_ulong bitDepthMinus8; /**< IN: The value "BitDepth minus 8" */
tcu_ulong ulIntraDecodeOnly; /**< IN: Set 1 only if video has all intra frames (default value is 0). This will
optimize video memory for Intra frames only decoding. The support is limited
- to specific codecs(H264 rightnow), the flag will be ignored for codecs which
+ to specific codecs - H264, HEVC, VP9, the flag will be ignored for codecs which
are not supported. However decoding might fail if the flag is enabled in case
of supported codecs for regular bit streams having P and/or B frames. */
tcu_ulong ulMaxWidth; /**< IN: Coded sequence max width in pixels used with reconfigure Decoder */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_loader.h new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_loader.h
--- old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_loader.h 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_loader.h 2019-09-23 16:03:27.000000000 +0200
@@ -156,6 +156,7 @@
tcuMemcpy2DAsync_v2 *cuMemcpy2DAsync;
tcuGetErrorName *cuGetErrorName;
tcuGetErrorString *cuGetErrorString;
+ tcuCtxGetDevice *cuCtxGetDevice;
tcuStreamCreate *cuStreamCreate;
tcuStreamQuery *cuStreamQuery;
@@ -280,6 +281,7 @@
LOAD_SYMBOL(cuMemcpy2DAsync, tcuMemcpy2DAsync_v2, "cuMemcpy2DAsync_v2");
LOAD_SYMBOL(cuGetErrorName, tcuGetErrorName, "cuGetErrorName");
LOAD_SYMBOL(cuGetErrorString, tcuGetErrorString, "cuGetErrorString");
+ LOAD_SYMBOL(cuCtxGetDevice, tcuCtxGetDevice, "cuCtxGetDevice");
LOAD_SYMBOL(cuStreamCreate, tcuStreamCreate, "cuStreamCreate");
LOAD_SYMBOL(cuStreamQuery, tcuStreamQuery, "cuStreamQuery");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_nvcuvid.h new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_nvcuvid.h
--- old/nv-codec-headers-9.0.18.1/include/ffnvcodec/dynlink_nvcuvid.h 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/include/ffnvcodec/dynlink_nvcuvid.h 2019-09-23 16:03:27.000000000 +0200
@@ -100,10 +100,16 @@
unsigned char bit_depth_luma_minus8; /**< OUT: high bit depth luma. E.g, 2 for 10-bitdepth, 4 for 12-bitdepth */
unsigned char bit_depth_chroma_minus8; /**< OUT: high bit depth chroma. E.g, 2 for 10-bitdepth, 4 for 12-bitdepth */
unsigned char min_num_decode_surfaces; /**< OUT: Minimum number of decode surfaces to be allocated for correct
- decoding. The client can send this value in
- ulNumDecodeSurfaces (in CUVIDDECODECREATEINFO strcuture).
- If this value is used for ulNumDecodeSurfaces then it has to
- also be returned to parser during sequence callback. */
+ decoding. The client can send this value in ulNumDecodeSurfaces
+ (in CUVIDDECODECREATEINFO structure).
+ This guarantees correct functionality and optimal video memory
+ usage but not necessarily the best performance, which depends on
+ the design of the overall application. The optimal number of
+ decode surfaces (in terms of performance and memory utilization)
+ should be decided by experimentation for each application, but it
+ cannot go below min_num_decode_surfaces.
+ If this value is used for ulNumDecodeSurfaces then it must be
+ returned to parser during sequence callback. */
unsigned int coded_width; /**< OUT: coded frame width in pixels */
unsigned int coded_height; /**< OUT: coded frame height in pixels */
/**
@@ -313,13 +319,14 @@
/***********************************************************************************************************************/
//! Parser callbacks
-//! The parser will call these synchronously from within cuvidParseVideoData(), whenever there is seqeuence change or a picture
+//! The parser will call these synchronously from within cuvidParseVideoData(), whenever there is sequence change or a picture
//! is ready to be decoded and/or displayed. First argument in functions is "void *pUserData" member of structure CUVIDSOURCEPARAMS
-//! Return values from these callbacks are interpreted as:
-//! PFNVIDSEQUENCECALLBACK : 0: fail, 1: suceeded, > 1: override dpb size of parser (set by CUVIDPARSERPARAMS::ulMaxNumDecodeSurfaces
+//! Return values from these callbacks are interpreted as below. If the callbacks return failure, it will be propagated by
+//! cuvidParseVideoData() to the application.
+//! PFNVIDSEQUENCECALLBACK : 0: fail, 1: succeeded, > 1: override dpb size of parser (set by CUVIDPARSERPARAMS::ulMaxNumDecodeSurfaces
//! while creating parser)
-//! PFNVIDDECODECALLBACK : 0: fail, >=1: suceeded
-//! PFNVIDDISPLAYCALLBACK : 0: fail, >=1: suceeded
+//! PFNVIDDECODECALLBACK : 0: fail, >=1: succeeded
+//! PFNVIDDISPLAYCALLBACK : 0: fail, >=1: succeeded
/***********************************************************************************************************************/
typedef int (CUDAAPI *PFNVIDSEQUENCECALLBACK)(void *, CUVIDEOFORMAT *);
typedef int (CUDAAPI *PFNVIDDECODECALLBACK)(void *, CUVIDPICPARAMS *);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-9.0.18.1/include/ffnvcodec/nvEncodeAPI.h new/nv-codec-headers-9.1.23.0/include/ffnvcodec/nvEncodeAPI.h
--- old/nv-codec-headers-9.0.18.1/include/ffnvcodec/nvEncodeAPI.h 2019-03-11 11:19:36.000000000 +0100
+++ new/nv-codec-headers-9.1.23.0/include/ffnvcodec/nvEncodeAPI.h 2019-09-23 16:03:27.000000000 +0200
@@ -30,7 +30,7 @@
* NVIDIA GPUs - beginning with the Kepler generation - contain a hardware-based encoder
* (referred to as NVENC) which provides fully-accelerated hardware-based video encoding.
* NvEncodeAPI provides the interface for NVIDIA video encoder (NVENC).
- * \date 2011-2018
+ * \date 2011-2019
* This file contains the interface constants, structure definitions and function prototypes.
*/
@@ -112,9 +112,10 @@
typedef void* NV_ENC_INPUT_PTR; /**< NVENCODE API input buffer */
typedef void* NV_ENC_OUTPUT_PTR; /**< NVENCODE API output buffer*/
typedef void* NV_ENC_REGISTERED_PTR; /**< A Resource that has been registered with NVENCODE API*/
+typedef void* NV_ENC_CUSTREAM_PTR; /**< Pointer to CUstream*/
#define NVENCAPI_MAJOR_VERSION 9
-#define NVENCAPI_MINOR_VERSION 0
+#define NVENCAPI_MINOR_VERSION 1
#define NVENCAPI_VERSION (NVENCAPI_MAJOR_VERSION | (NVENCAPI_MINOR_VERSION << 24))
@@ -715,6 +716,21 @@
} NV_ENC_DEVICE_TYPE;
/**
+ * Number of reference frames
+ */
+typedef enum _NV_ENC_NUM_REF_FRAMES
+{
+ NV_ENC_NUM_REF_FRAMES_AUTOSELECT = 0x0, /**< Number of reference frames is auto selected by the encoder driver */
+ NV_ENC_NUM_REF_FRAMES_1 = 0x1, /**< Number of reference frames equal to 1 */
+ NV_ENC_NUM_REF_FRAMES_2 = 0x2, /**< Number of reference frames equal to 2 */
+ NV_ENC_NUM_REF_FRAMES_3 = 0x3, /**< Number of reference frames equal to 3 */
+ NV_ENC_NUM_REF_FRAMES_4 = 0x4, /**< Number of reference frames equal to 4 */
+ NV_ENC_NUM_REF_FRAMES_5 = 0x5, /**< Number of reference frames equal to 5 */
+ NV_ENC_NUM_REF_FRAMES_6 = 0x6, /**< Number of reference frames equal to 6 */
+ NV_ENC_NUM_REF_FRAMES_7 = 0x7 /**< Number of reference frames equal to 7 */
+} NV_ENC_NUM_REF_FRAMES;
+
+/**
* Encoder capabilities enumeration.
*/
typedef enum _NV_ENC_CAPS
@@ -781,9 +797,11 @@
NV_ENC_CAPS_SUPPORT_ADAPTIVE_TRANSFORM,
/**
- * Reserved enum field.
+ * Indicates HW support for Multi View Coding.
+ * \n 0 : Multi View Coding not supported.
+ * \n 1 : Multi View Coding supported.
*/
- NV_ENC_CAPS_SUPPORT_RESERVED,
+ NV_ENC_CAPS_SUPPORT_STEREO_MVC,
/**
* Indicates HW support for encoding Temporal layers.
@@ -1033,6 +1051,21 @@
*/
NV_ENC_CAPS_SUPPORT_EMPHASIS_LEVEL_MAP,
+ /**
+ * Minimum input width supported.
+ */
+ NV_ENC_CAPS_WIDTH_MIN,
+
+ /**
+ * Minimum input height supported.
+ */
+ NV_ENC_CAPS_HEIGHT_MIN,
+
+ /**
+ * Indicates HW support for multiple reference frames.
+ */
+ NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES,
+
/**
* Reserved - Not to be used by clients.
*/
@@ -1170,9 +1203,9 @@
*/
typedef struct _NV_ENC_QP
{
- uint32_t qpInterP;
- uint32_t qpInterB;
- uint32_t qpIntra;
+ uint32_t qpInterP; /**< [in]: Specifies QP value for P-frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
+ uint32_t qpInterB; /**< [in]: Specifies QP value for B-frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
+ uint32_t qpIntra; /**< [in]: Specifies QP value for Intra Frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
} NV_ENC_QP;
/**
@@ -1195,7 +1228,7 @@
uint32_t enableLookahead :1; /**< [in]: Set this to 1 to enable lookahead with depth <lookaheadDepth> (if lookahead is enabled, input frames must remain available to the encoder until encode completion) */
uint32_t disableIadapt :1; /**< [in]: Set this to 1 to disable adaptive I-frame insertion at scene cuts (only has an effect when lookahead is enabled) */
uint32_t disableBadapt :1; /**< [in]: Set this to 1 to disable adaptive B-frame decision (only has an effect when lookahead is enabled) */
- uint32_t enableTemporalAQ :1; /**< [in]: Set this to 1 to enable temporal AQ for H.264 */
+ uint32_t enableTemporalAQ :1; /**< [in]: Set this to 1 to enable temporal AQ */
uint32_t zeroReorderDelay :1; /**< [in]: Set this to 1 to indicate zero latency operation (no reordering delay, num_reorder_frames=0) */
uint32_t enableNonRefP :1; /**< [in]: Set this to 1 to enable automatic insertion of non-reference P-frames (no effect if enablePTD=0) */
uint32_t strictGOPTarget :1; /**< [in]: Set this to 1 to minimize GOP-to-GOP rate fluctuations */
@@ -1210,19 +1243,19 @@
uint8_t targetQualityLSB; /**< [in]: Fractional part of target quality (as 8.8 fixed point format) */
uint16_t lookaheadDepth; /**< [in]: Maximum depth of lookahead with range 0-32 (only used if enableLookahead=1) */
uint32_t reserved1;
- NV_ENC_QP_MAP_MODE qpMapMode; /**< [in]: This flag is used to interpret values in array pecified by NV_ENC_PIC_PARAMS::qpDeltaMap.
- Set this to NV_ENC_QP_MAP_EMPHASIS to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as Emphasis level Map.
+ NV_ENC_QP_MAP_MODE qpMapMode; /**< [in]: This flag is used to interpret values in array specified by NV_ENC_PIC_PARAMS::qpDeltaMap.
+ Set this to NV_ENC_QP_MAP_EMPHASIS to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as Emphasis Level Map.
Emphasis Level can be assigned any value specified in enum NV_ENC_EMPHASIS_MAP_LEVEL.
Emphasis Level Map is used to specify regions to be encoded at varying levels of quality.
The hardware encoder adjusts the quantization within the image as per the provided emphasis map,
by adjusting the quantization parameter (QP) assigned to each macroblock. This adjustment is commonly called “Delta QP”.
The adjustment depends on the absolute QP decided by the rate control algorithm, and is applied after the rate control has decided each macroblock’s QP.
- Since the Delta QP overrides rate control, enabling emphasis level map may violate bitrate and VBV buffersize constraints.
- Emphasis level map is useful in situations when client has a priori knowledge of the image complexity (e.g. via use of NVFBC's Classification feature) and encoding those high-complexity areas at higher quality (lower QP) is important, even at the possible cost of violating bitrate/VBV buffersize constraints
+ Since the Delta QP overrides rate control, enabling Emphasis Level Map may violate bitrate and VBV buffer size constraints.
+ Emphasis Level Map is useful in situations where client has a priori knowledge of the image complexity (e.g. via use of NVFBC's Classification feature) and encoding those high-complexity areas at higher quality (lower QP) is important, even at the possible cost of violating bitrate/VBV buffer size constraints
This feature is not supported when AQ( Spatial/Temporal) is enabled.
This feature is only supported for H264 codec currently.
- Set this to NV_ENC_QP_MAP_DELTA to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as QPDelta. This specify QP modifier to be applied on top of the QP chosen by rate control
+ Set this to NV_ENC_QP_MAP_DELTA to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as QPDelta. This specifies QP modifier to be applied on top of the QP chosen by rate control
Set this to NV_ENC_QP_MAP_DISABLED to ignore NV_ENC_PIC_PARAMS::qpDeltaMap values. In this case, qpDeltaMap should be set to NULL.
@@ -1297,7 +1330,7 @@
*/
typedef struct _NV_ENC_CONFIG_H264
{
- uint32_t enableTemporalSVC :1; /**< [in]: Set to 1 to enable SVC temporal*/
+ uint32_t reserved :1; /**< [in]: Reserved and must be set to 0 */
uint32_t enableStereoMVC :1; /**< [in]: Set to 1 to enable stereo MVC*/
uint32_t hierarchicalPFrames :1; /**< [in]: Set to 1 to enable hierarchical PFrames */
uint32_t hierarchicalBFrames :1; /**< [in]: Set to 1 to enable hierarchical BFrames */
@@ -1323,7 +1356,17 @@
uint32_t qpPrimeYZeroTransformBypassFlag :1; /**< [in]: To enable lossless encode set this to 1, set QP to 0 and RC_mode to NV_ENC_PARAMS_RC_CONSTQP and profile to HIGH_444_PREDICTIVE_PROFILE.
Check support for lossless encoding using ::NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE caps. */
uint32_t useConstrainedIntraPred :1; /**< [in]: Set 1 to enable constrained intra prediction. */
- uint32_t reservedBitFields :15; /**< [in]: Reserved bitfields and must be set to 0 */
+ uint32_t enableFillerDataInsertion :1; /**< [in]: Set to 1 to enable insertion of filler data in the bitstream.
+ This flag will take effect only when one of the CBR rate
+ control modes (NV_ENC_PARAMS_RC_CBR, NV_ENC_PARAMS_RC_CBR_HQ,
+ NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) is in use and both
+ NV_ENC_INITIALIZE_PARAMS::frameRateNum and
+ NV_ENC_INITIALIZE_PARAMS::frameRateDen are set to non-zero
+ values. Setting this field when
+ NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is also set
+ is currently not supported and will make ::NvEncInitializeEncoder()
+ return an error. */
+ uint32_t reservedBitFields :14; /**< [in]: Reserved bitfields and must be set to 0 */
uint32_t level; /**< [in]: Specifies the encoding level. Client is recommended to set this to NV_ENC_LEVEL_AUTOSELECT in order to enable the NvEncodeAPI interface to select the correct level. */
uint32_t idrPeriod; /**< [in]: Specifies the IDR interval. If not set, this is made equal to gopLength in NV_ENC_CONFIG.Low latency application client can set IDR interval to NVENC_INFINITE_GOPLENGTH so that IDR frames are not inserted automatically. */
uint32_t separateColourPlaneFlag; /**< [in]: Set to 1 to enable 4:4:4 separate colour planes */
@@ -1364,7 +1407,11 @@
Check support for YUV444 encoding using ::NV_ENC_CAPS_SUPPORT_YUV444_ENCODE caps.*/
uint32_t maxTemporalLayers; /**< [in]: Specifies the max temporal layer used for hierarchical coding. */
NV_ENC_BFRAME_REF_MODE useBFramesAsRef; /**< [in]: Specifies the B-Frame as reference mode. Check support for useBFramesAsRef mode using ::NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE caps.*/
- uint32_t reserved1[269]; /**< [in]: Reserved and must be set to 0 */
+ NV_ENC_NUM_REF_FRAMES numRefL0; /**< [in]: Specifies max number of reference frames in reference picture list L0, that can be used by hardware for prediction of a frame.
+ Check support for numRefL0 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
+ NV_ENC_NUM_REF_FRAMES numRefL1; /**< [in]: Specifies max number of reference frames in reference picture list L1, that can be used by hardware for prediction of a frame.
+ Check support for numRefL1 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
+ uint32_t reserved1[267]; /**< [in]: Reserved and must be set to 0 */
void* reserved2[64]; /**< [in]: Reserved and must be set to NULL */
} NV_ENC_CONFIG_H264;
@@ -1395,7 +1442,17 @@
uint32_t enableIntraRefresh :1; /**< [in]: Set 1 to enable gradual decoder refresh or intra refresh. If the GOP structure uses B frames this will be ignored */
uint32_t chromaFormatIDC :2; /**< [in]: Specifies the chroma format. Should be set to 1 for yuv420 input, 3 for yuv444 input.*/
uint32_t pixelBitDepthMinus8 :3; /**< [in]: Specifies pixel bit depth minus 8. Should be set to 0 for 8 bit input, 2 for 10 bit input.*/
- uint32_t reserved :18; /**< [in]: Reserved bitfields.*/
+ uint32_t enableFillerDataInsertion :1; /**< [in]: Set to 1 to enable insertion of filler data in the bitstream.
+ This flag will take effect only when one of the CBR rate
+ control modes (NV_ENC_PARAMS_RC_CBR, NV_ENC_PARAMS_RC_CBR_HQ,
+ NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) is in use and both
+ NV_ENC_INITIALIZE_PARAMS::frameRateNum and
+ NV_ENC_INITIALIZE_PARAMS::frameRateDen are set to non-zero
+ values. Setting this field when
+ NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is also set
+ is currently not supported and will make ::NvEncInitializeEncoder()
+ return an error. */
+ uint32_t reserved :17; /**< [in]: Reserved bitfields.*/
uint32_t idrPeriod; /**< [in]: Specifies the IDR interval. If not set, this is made equal to gopLength in NV_ENC_CONFIG.Low latency application client can set IDR interval to NVENC_INFINITE_GOPLENGTH so that IDR frames are not inserted automatically. */
uint32_t intraRefreshPeriod; /**< [in]: Specifies the interval between successive intra refresh if enableIntrarefresh is set. Requires enableIntraRefresh to be set.
Will be disabled if NV_ENC_CONFIG::gopLength is not set to NVENC_INFINITE_GOPLENGTH. */
@@ -1422,8 +1479,12 @@
be deprecated in future releases.
Set to 0 when using "LTR Per Picture" mode of LTR operation. */
NV_ENC_BFRAME_REF_MODE useBFramesAsRef; /**< [in]: Specifies the B-Frame as reference mode. Check support for useBFramesAsRef mode using ::NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE caps.*/
- uint32_t reserved1[216]; /**< [in]: Reserved and must be set to 0.*/
- void* reserved2[64]; /**< [in]: Reserved and must be set to NULL */
+ NV_ENC_NUM_REF_FRAMES numRefL0; /**< [in]: Specifies max number of reference frames in reference picture list L0, that can be used by hardware for prediction of a frame.
+ Check support for numRefL0 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
+ NV_ENC_NUM_REF_FRAMES numRefL1; /**< [in]: Specifies max number of reference frames in reference picture list L1, that can be used by hardware for prediction of a frame.
+ Check support for numRefL1 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
+ uint32_t reserved1[214]; /**< [in]: Reserved and must be set to 0.*/
+ void* reserved2[64]; /**< [in]: Reserved and must be set to NULL */
} NV_ENC_CONFIG_HEVC;
/**
@@ -1590,6 +1651,34 @@
/**
+ * \struct _NV_ENC_PIC_PARAMS_MVC
+ * MVC-specific parameters to be sent on a per-frame basis.
+ */
+typedef struct _NV_ENC_PIC_PARAMS_MVC
+{
+ uint32_t version; /**< [in]: Struct version. Must be set to ::NV_ENC_PIC_PARAMS_MVC_VER. */
+ uint32_t viewID; /**< [in]: Specifies the view ID associated with the current input view. */
+ uint32_t temporalID; /**< [in]: Specifies the temporal ID associated with the current input view. */
+ uint32_t priorityID; /**< [in]: Specifies the priority ID associated with the current input view. Reserved and ignored by the NvEncodeAPI interface. */
+ uint32_t reserved1[12]; /**< [in]: Reserved and must be set to 0. */
+ void* reserved2[8]; /**< [in]: Reserved and must be set to NULL. */
+}NV_ENC_PIC_PARAMS_MVC;
+
+/** macro for constructing the version field of ::_NV_ENC_PIC_PARAMS_MVC */
+#define NV_ENC_PIC_PARAMS_MVC_VER NVENCAPI_STRUCT_VERSION(1)
+
+
+/**
+ * \union _NV_ENC_PIC_PARAMS_H264_EXT
+ * H264 extension picture parameters
+ */
+typedef union _NV_ENC_PIC_PARAMS_H264_EXT
+{
+ NV_ENC_PIC_PARAMS_MVC mvcPicParams; /**< [in]: Specifies the MVC picture parameters. */
+ uint32_t reserved1[32]; /**< [in]: Reserved and must be set to 0. */
+}NV_ENC_PIC_PARAMS_H264_EXT;
+
+/**
* \struct _NV_ENC_SEI_PAYLOAD
* User SEI message
*/
@@ -1642,7 +1731,8 @@
This option along with forceIntraSliceIdx[] array needs to be used with sliceMode = 3 only */
uint32_t *forceIntraSliceIdx; /**< [in]: Slice indices to be forced to intra in the current picture. Each slice index should be <= num_slices_in_picture -1. Index starts from 0 for first slice.
The number of entries in this array should be equal to forceIntraSliceCount */
- uint32_t reserved [242]; /**< [in]: Reserved and must be set to 0. */
+ NV_ENC_PIC_PARAMS_H264_EXT h264ExtPicParams; /**< [in]: Specifies the H264 extension config parameters using this config. */
+ uint32_t reserved [210]; /**< [in]: Reserved and must be set to 0. */
void* reserved2[61]; /**< [in]: Reserved and must be set to NULL. */
} NV_ENC_PIC_PARAMS_H264;
@@ -1734,11 +1824,11 @@
+ 4*meHintCountsPerBlock[Lx].numCandsPerBlk8x8. For frames using bidirectional ME , the total number of candidates for single macroblock is sum of total number of candidates per MB for each direction (L0 and L1) */
uint32_t reserved1[6]; /**< [in]: Reserved and must be set to 0 */
void* reserved2[2]; /**< [in]: Reserved and must be set to NULL */
- int8_t *qpDeltaMap; /**< [in]: Specifies the pointer to signed byte array containing value per MB in raster scan order for the current picture, which will be Interperated depending on NV_ENC_RC_PARAMS::qpMapMode.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DELTA , This specify QP modifier to be applied on top of the QP chosen by rate control.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_EMPHASIS, it specifies emphasis level map per MB. This level value along with QP chosen by rate control is used to compute the QP modifier,
- which in turn is applied on top of QP chosen by rate control.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DISABLED value in qpDeltaMap will be ignored.*/
+ int8_t *qpDeltaMap; /**< [in]: Specifies the pointer to signed byte array containing value per MB in raster scan order for the current picture, which will be interpreted depending on NV_ENC_RC_PARAMS::qpMapMode.
+ If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DELTA, qpDeltaMap specifies QP modifier per MB. This QP modifier will be applied on top of the QP chosen by rate control.
+ If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_EMPHASIS, qpDeltaMap specifies Emphasis Level Map per MB. This level value along with QP chosen by rate control is used to
+ compute the QP modifier, which in turn is applied on top of QP chosen by rate control.
+ If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DISABLED, value in qpDeltaMap will be ignored.*/
uint32_t qpDeltaMapSize; /**< [in]: Specifies the size in bytes of qpDeltaMap surface allocated by client and pointed to by NV_ENC_PIC_PARAMS::qpDeltaMap. Surface (array) should be picWidthInMbs * picHeightInMbs */
uint32_t reservedBitFields; /**< [in]: Reserved bitfields and must be set to 0 */
uint16_t meHintRefPicDist[2]; /**< [in]: Specifies temporal distance for reference picture (NVENC_EXTERNAL_ME_HINT::refidx = 0) used during external ME with NV_ENC_INITALIZE_PARAMS::enablePTD = 1 . meHintRefPicDist[0] is for L0 hints and meHintRefPicDist[1] is for L1 hints.
@@ -2491,6 +2581,41 @@
*/
NVENCSTATUS NVENCAPI NvEncDestroyInputBuffer (void* encoder, NV_ENC_INPUT_PTR inputBuffer);
+// NvEncSetIOCudaStreams
+/**
+ * \brief Set input and output CUDA stream for specified encoder attribute.
+ *
+ * Encoding may involve CUDA pre-processing on the input and post-processing on encoded output.
+ * This function is used to set input and output CUDA streams to pipeline the CUDA pre-processing
+ * and post-processing tasks. Clients should call this function before the call to
+ * NvEncUnlockInputBuffer(). If this function is not called, the default CUDA stream is used for
+ * input and output processing. After a successful call to this function, the streams specified
+ * in that call will replace the previously-used streams.
+ * This API is supported for NVCUVID interface only.
+ *
+ * \param [in] encoder
+ * Pointer to the NvEncodeAPI interface.
+ * \param [in] inputStream
+ * Pointer to CUstream which is used to process ::NV_ENC_PIC_PARAMS::inputFrame for encode.
+ * In case of ME-only mode, inputStream is used to process ::NV_ENC_MEONLY_PARAMS::inputBuffer and
+ * ::NV_ENC_MEONLY_PARAMS::referenceFrame
+ * \param [in] outputStream
+ * Pointer to CUstream which is used to process ::NV_ENC_PIC_PARAMS::outputBuffer for encode.
+ * In case of ME-only mode, outputStream is used to process ::NV_ENC_MEONLY_PARAMS::mvBuffer
+ *
+ * \return
+ * ::NV_ENC_SUCCESS \n
+ * ::NV_ENC_ERR_INVALID_PTR \n
+ * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
+ * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
+ * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
+ * ::NV_ENC_ERR_OUT_OF_MEMORY \n
+ * ::NV_ENC_ERR_INVALID_PARAM \n
+ * ::NV_ENC_ERR_INVALID_VERSION \n
+ * ::NV_ENC_ERR_GENERIC \n
+ */
+NVENCSTATUS NVENCAPI NvEncSetIOCudaStreams (void* encoder, NV_ENC_CUSTREAM_PTR inputStream, NV_ENC_CUSTREAM_PTR outputStream);
+
// NvEncCreateBitstreamBuffer
/**
@@ -2570,6 +2695,11 @@
* - NV_ENC_PIC_PARAMS_H264::frameNumSyntax(H264 only)
* - NV_ENC_PIC_PARAMS_H264::refPicFlag(H264 only)
*
+ *\par MVC Encoding:
+ * For MVC encoding the client must call encode picture api for each view separately
+ * and must pass valid view id in NV_ENC_PIC_PARAMS_MVC::viewID field. Currently
+ * NvEncodeAPI only support stereo MVC so client must send viewID as 0 for base
+ * view and view ID as 1 for dependent view.
*
*\par Asynchronous Encoding
* If the client has enabled asynchronous mode of encoding by setting
@@ -3363,6 +3493,22 @@
NVENCSTATUS NVENCAPI NvEncodeAPIGetMaxSupportedVersion (uint32_t* version);
+// NvEncodeAPIGetLastErrorString
+/**
+ * \brief Get the description of the last error reported by the API.
+ *
+ * This function returns a null-terminated string that can be used by clients to better understand the reason
+ * for failure of a previous API call.
+ *
+ * \param [in] encoder
+ * Pointer to the NvEncodeAPI interface.
+ *
+ * \return
+ * Pointer to buffer containing the details of the last error encountered by the API.
+ */
+const char * NVENCAPI NvEncGetLastErrorString (void* encoder);
+
+
/// \cond API PFN
/*
* Defines API function pointers
@@ -3404,6 +3550,8 @@
typedef NVENCSTATUS (NVENCAPI* PNVENCCREATEMVBUFFER) (void* encoder, NV_ENC_CREATE_MV_BUFFER* createMVBufferParams);
typedef NVENCSTATUS (NVENCAPI* PNVENCDESTROYMVBUFFER) (void* encoder, NV_ENC_OUTPUT_PTR mvBuffer);
typedef NVENCSTATUS (NVENCAPI* PNVENCRUNMOTIONESTIMATIONONLY) (void* encoder, NV_ENC_MEONLY_PARAMS* meOnlyParams);
+typedef const char * (NVENCAPI* PNVENCGETLASTERROR) (void* encoder);
+typedef NVENCSTATUS (NVENCAPI* PNVENCSETIOCUDASTREAMS) (void* encoder, NV_ENC_CUSTREAM_PTR inputStream, NV_ENC_CUSTREAM_PTR outputStream);
/// \endcond
@@ -3456,7 +3604,9 @@
PNVENCCREATEMVBUFFER nvEncCreateMVBuffer; /**< [out]: Client should access ::NvEncCreateMVBuffer API through this pointer. */
PNVENCDESTROYMVBUFFER nvEncDestroyMVBuffer; /**< [out]: Client should access ::NvEncDestroyMVBuffer API through this pointer. */
PNVENCRUNMOTIONESTIMATIONONLY nvEncRunMotionEstimationOnly; /**< [out]: Client should access ::NvEncRunMotionEstimationOnly API through this pointer. */
- void* reserved2[281]; /**< [in]: Reserved and must be set to NULL */
+ PNVENCGETLASTERROR nvEncGetLastErrorString; /**< [out]: Client should access ::nvEncGetLastErrorString API through this pointer. */
+ PNVENCSETIOCUDASTREAMS nvEncSetIOCudaStreams; /**< [out]: Client should access ::nvEncSetIOCudaStreams API through this pointer. */
+ void* reserved2[279]; /**< [in]: Reserved and must be set to NULL */
} NV_ENCODE_API_FUNCTION_LIST;
/** Macro for constructing the version field of ::_NV_ENCODEAPI_FUNCTION_LIST. */
1
0
Hello community,
here is the log from the commit of package python-graphviz for openSUSE:Factory checked in at 2019-11-30 10:35:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-graphviz (Old)
and /work/SRC/openSUSE:Factory/.python-graphviz.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-graphviz"
Sat Nov 30 10:35:57 2019 rev:9 rq:750863 version:0.13.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-graphviz/python-graphviz.changes 2019-09-23 12:09:05.465888719 +0200
+++ /work/SRC/openSUSE:Factory/.python-graphviz.new.26869/python-graphviz.changes 2019-11-30 10:36:46.616176546 +0100
@@ -1,0 +2,11 @@
+Sun Nov 24 17:21:08 UTC 2019 - Arun Persaud <arun(a)gmx.de>
+
+- update to version 0.13.2:
+ * Fix missing support for four-part versions in
+ "graphviz.version()".
+
+- changes from version 0.13.1:
+ * Tag Python 3.8 support.
+ * Fix quoting for non-ASCII numerals.
+
+-------------------------------------------------------------------
Old:
----
graphviz-0.13.zip
New:
----
graphviz-0.13.2.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-graphviz.spec ++++++
--- /var/tmp/diff_new_pack.ICpfbV/_old 2019-11-30 10:36:48.868176275 +0100
+++ /var/tmp/diff_new_pack.ICpfbV/_new 2019-11-30 10:36:48.904176271 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-graphviz
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-graphviz
-Version: 0.13
+Version: 0.13.2
Release: 0
Summary: Python interface for Graphviz
License: MIT
1
0
Hello community,
here is the log from the commit of package fastjet for openSUSE:Factory checked in at 2019-11-30 10:35:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fastjet (Old)
and /work/SRC/openSUSE:Factory/.fastjet.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fastjet"
Sat Nov 30 10:35:55 2019 rev:6 rq:746504 version:3.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/fastjet/fastjet.changes 2016-11-14 20:16:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.fastjet.new.26869/fastjet.changes 2019-11-30 10:36:37.224177674 +0100
@@ -1,0 +2,28 @@
+Fri Nov 8 01:44:46 UTC 2019 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 3.3.2:
+ * Improved the shared-library behaviour by setting the proper
+ inter-dependences
+ * Included SISCone v3.0.4 with a similar fix
+- Changes from version 3.3.1:
+ * Main FastJet license clarified as being GPL v2 or later
+ * Added theta() and cos_theta() members to PseudoJet
+ * Added a --with-cgal-boostdir=... configure option to handle
+ cases where CGAL uses a non-standard Boost installation path
+ * Fixed compilation bug in the SISCone interface
+- Use fdupes to link duplicated files.
+- Update License to GPL-2.0-or-later.
+
+-------------------------------------------------------------------
+Wed Aug 2 07:59:38 UTC 2017 - badshah400(a)gmail.com
+
+- Update to version 3.3.0:
+ * This release adds a first version of a Python interface to
+ FastJet
+- Enable python bindings:
+ * Split out a python-fastjet subpackage.
+ * Add python BuildRequires
+ * Pass --enable-pyext to configure
+ * Package python examples.
+
+-------------------------------------------------------------------
Old:
----
fastjet-3.2.1.tar.gz
New:
----
fastjet-3.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fastjet.spec ++++++
--- /var/tmp/diff_new_pack.Tr7Cs3/_old 2019-11-30 10:36:38.572177512 +0100
+++ /var/tmp/diff_new_pack.Tr7Cs3/_new 2019-11-30 10:36:38.608177508 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fastjet
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,21 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: fastjet
-Version: 3.2.1
+Version: 3.3.2
Release: 0
Summary: Package for jet finding in pp and e+e- collisions
-License: GPL-2.0
+License: GPL-2.0-or-later
Group: Development/Libraries/C and C++
Url: http://fastjet.fr/
Source: http://fastjet.fr/repo/%{name}-%{version}.tar.gz
+BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: python3-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -120,18 +122,30 @@
This package provides the develoment files for SISCone plugin for
fastjet.
+%package -n python3-%{name}
+Summary: Python3 bindings for fastjet
+Group: Development/Libraries/Python
+
+%description -n python3-%{name}
+FastJet is a software package for jet finding in pp and e+e-
+collisions.
+
+This package provides python3 bindings for fastjet.
+
%prep
%setup -q
%build
-%configure --disable-static --enable-allcxxplugins
+%configure --disable-static --enable-allcxxplugins --enable-pyext
make %{?_smp_mflags}
%install
%make_install
# REMOVE libtool ARCHIVES
-rm %{buildroot}%{_libdir}/*.la
+find %{buildroot} -name "*.la" -delete -print
+
+%fdupes %{buildroot}%{python3_sitelib}/
%post -n libfastjet0 -p /sbin/ldconfig
@@ -165,4 +179,9 @@
%{_libdir}/libsiscone*.so
%{_includedir}/siscone/
+%files -n python3-%{name}
+%defattr(-,root,root)
+%{python3_sitelib}/fastjet.*
+%{python3_sitearch}/_fastjet.*
+
%changelog
++++++ fastjet-3.2.1.tar.gz -> fastjet-3.3.2.tar.gz ++++++
++++ 114258 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory checked in at 2019-11-30 10:35:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-camlp4"
Sat Nov 30 10:35:50 2019 rev:6 rq:750771 version:4.05
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes 2019-11-07 23:14:36.404408613 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26869/ocaml-camlp4.changes 2019-11-30 10:36:33.188178158 +0100
@@ -1,0 +2,5 @@
+Mon Nov 25 12:34:56 UTC 2019 - ohering(a)suse.de
+
+- Add compiler-libs-devel to BuildRequires (bsc#1156934)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-camlp4.spec ++++++
--- /var/tmp/diff_new_pack.y5qrZw/_old 2019-11-30 10:36:34.544177996 +0100
+++ /var/tmp/diff_new_pack.y5qrZw/_new 2019-11-30 10:36:34.544177996 +0100
@@ -28,6 +28,7 @@
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-rpm-macros >= 20191101
BuildRequires: ocaml(ocaml_base_version) = 4.05
+BuildRequires: ocamlfind(compiler-libs)
Conflicts: ocaml < 4.05.0
Requires: ocaml-runtime = 4.05.0
1
0
Hello community,
here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2019-11-30 10:35:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml (Old)
and /work/SRC/openSUSE:Factory/.ocaml.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml"
Sat Nov 30 10:35:45 2019 rev:73 rq:750769 version:4.05.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2019-11-07 23:14:19.448390041 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml.new.26869/ocaml.changes 2019-11-30 10:36:26.500178962 +0100
@@ -1,0 +2,9 @@
+Mon Nov 25 12:34:56 UTC 2019 - ohering(a)suse.de
+
+- move topdirs.cmi/cmt/cmti from runtime to compiler-libs-devel
+ so that runtime does not depend on a devel pkg (bsc#1156934)
+- split place for META files, some go to ocaml, some to compiler-libs-devel
+- move ncurses-devel requires to ocaml, it is used by BYTECCLIBS
+- initialize bcond ocaml_make_testsuite
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.KY1bNt/_old 2019-11-30 10:36:28.944178669 +0100
+++ /var/tmp/diff_new_pack.KY1bNt/_new 2019-11-30 10:36:28.948178668 +0100
@@ -24,6 +24,7 @@
# This ensures that the find_provides/find_requires calls ocamlobjinfo correctly.
%global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte"
%global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte"
+%bcond_with ocaml_make_testsuite
Name: ocaml
Version: 4.05.0
@@ -41,13 +42,13 @@
Patch8: ocaml-4.05.0-CVE-2018-9838.patch
# FIX-UPSTREAM backport 'AArch64 GOT fixed' - https://github.com/ocaml/ocaml/pull/1330
Patch9: ocaml-fix_aarch64_build.patch
-# This gets ocamlobjinfo to work with .cmxs files
BuildRequires: binutils-devel
BuildRequires: fdupes
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(x11)
BuildRequires: ocaml-rpm-macros >= 20191101
+Requires: ncurses-devel
Requires: ocaml(runtime) = %{version}-%{release}
Obsoletes: ocaml-docs
Provides: ocaml(compiler) = %{ocaml_base_version}
@@ -116,7 +117,7 @@
Summary: Libraries used internal to the OCaml Compiler
License: QPL-1.0
Group: Development/Languages/OCaml
-Requires: ncurses-devel
+Requires: ocaml = %{version}-%{release}
%description compiler-libs
OCaml is a high-level, strongly-typed, functional and object-oriented
@@ -130,7 +131,7 @@
Summary: Libraries used internal to the OCaml Compiler
License: QPL-1.0
Group: Development/Languages/OCaml
-Requires: ocaml-compiler-libs = %{version}
+Requires: ocaml-compiler-libs = %{version}-%{release}
%description compiler-libs-devel
OCaml is a high-level, strongly-typed, functional and object-oriented
@@ -409,9 +410,12 @@
ocamldoc)
files='files.ocamldoc.META'
;;
- *)
+ compiler-libs)
files='files.compiler-libs.META'
;;
+ *)
+ files='files.ocaml.META'
+ ;;
esac
d=%{_libdir}/ocaml/${ocamlfind}
f=${d}/META
@@ -479,6 +483,9 @@
%{_libdir}/ocaml/threads/*.cma
%{_libdir}/ocaml/threads/*.cmti
%exclude %{_libdir}/ocaml/graphicsX11.cmi
+%exclude %{_libdir}/ocaml/topdirs.cmi
+%exclude %{_libdir}/ocaml/topdirs.cmt
+%exclude %{_libdir}/ocaml/topdirs.cmti
%doc Changes
%license LICENSE
@@ -494,11 +501,18 @@
%{_libdir}/ocaml/ocamldoc
%doc ocamldoc/Changes.txt
-%files compiler-libs -f files.compiler-libs.META
-%license LICENSE
+%files compiler-libs
%dir %{_libdir}/ocaml
+%{_libdir}/ocaml/topdirs.cmi
+%{_libdir}/ocaml/topdirs.cmt
+%{_libdir}/ocaml/topdirs.cmti
+%{_libdir}/ocaml/compiler-libs/*.cma
+%{_libdir}/ocaml/compiler-libs/*.cmi
+%{_libdir}/ocaml/compiler-libs/*.cmo
+%{_libdir}/ocaml/compiler-libs/*.cmt
+%{_libdir}/ocaml/compiler-libs/*.cmti
-%files compiler-libs-devel
+%files compiler-libs-devel -f files.compiler-libs.META
%dir %{_libdir}/ocaml/compiler-libs
%if %{ocaml_native_compiler}
%{_libdir}/ocaml/compiler-libs/*.a
@@ -506,11 +520,6 @@
%{_libdir}/ocaml/compiler-libs/*.cmx
%{_libdir}/ocaml/compiler-libs/*.cmxa
%endif
-%{_libdir}/ocaml/compiler-libs/*.cma
-%{_libdir}/ocaml/compiler-libs/*.cmi
-%{_libdir}/ocaml/compiler-libs/*.cmo
-%{_libdir}/ocaml/compiler-libs/*.cmt
-%{_libdir}/ocaml/compiler-libs/*.cmti
%{_libdir}/ocaml/compiler-libs/*.mli
%if %{with ocaml_make_testsuite}
1
0
Hello community,
here is the log from the commit of package quantum-espresso for openSUSE:Factory checked in at 2019-11-30 10:35:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/quantum-espresso (Old)
and /work/SRC/openSUSE:Factory/.quantum-espresso.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quantum-espresso"
Sat Nov 30 10:35:44 2019 rev:6 rq:746231 version:6.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/quantum-espresso/quantum-espresso.changes 2019-11-06 14:05:58.304777602 +0100
+++ /work/SRC/openSUSE:Factory/.quantum-espresso.new.26869/quantum-espresso.changes 2019-11-30 10:36:18.316179945 +0100
@@ -1,0 +2,55 @@
+Thu Nov 7 00:52:39 UTC 2019 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Add backports-6.4.1.git-diff: Backported fixes for version
+ 6.4.1 from upstream:
+ * Bug in spin-polarized meta-GGA
+ * Unphysical fractional translations (tau/n with n/=2,3,4,6)
+ were not explicitly discarded, thus leading in unfortunate
+ cases to strange values for FFT factors and grids. Also: if
+ "nosym" is true, inversion symmetry flag (invsym) and info on
+ FFT factors (fft_fact) must also be reset
+ * PPACF wasn't working any longer in v.6.4 and 6.4.1 for nspin=2
+ and for hybrid functionals
+ * option "write_unkg" of pw2wannier90.f90 wasn't working as
+ expected
+ * Input parameters (for restarting DFPT+U calculations)
+ read_dns_bare and d2ns_type were missing in the PH input
+ namelist, and moreover they were not broadcasted.
+
+-------------------------------------------------------------------
+Thu Nov 7 00:48:21 UTC 2019 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 6.4.1:
+ * A warning is issued if the lattice parameter seems to be a
+ conversion factor instead of a true lattice parameter.
+ * A warning is issued if ibrav=0 is used for systems having
+ symmetry.
+ * [HP] the code was not working correctly when fractional
+ translations were present
+ * [HP] there was a bug in the case when either there is only one
+ k point, or when k pools are used and some of the pools have
+ only one k point.
+ * Restart of ph.x with 2D boundary conditions has been fixed
+ (see gitlab issue #102 (closed))
+ * XML file correctly written if tetrahedra are used (see gitlab
+ issue #103 (closed))
+- Major changes since last packaged version including backward
+ incomaptible changes: See
+ * https://gitlab.com/QEF/q-e/-/tags/qe-6.0.0
+ * https://gitlab.com/QEF/q-e/-/tags/qe-6.1.0
+ * https://gitlab.com/QEF/q-e/-/tags/qe-6.2.0
+ * https://gitlab.com/QEF/q-e/wikis/Releases/Quantum-Espresso-6.3-Release-Notes
+ * https://gitlab.com/QEF/q-e/wikis/Releases/Quantum-Espresso-6.4-Release-Notes
+- Drop patches no longer compatible or needed with updated
+ version:
+ * quantum_espresso_do_not_set_xlf_for_powerpc.patch
+ * quantum_espresso_add_ppc64le_archi_to_configure.patch
+ * espresso-implicit-pointer-decl.patch
+
+-------------------------------------------------------------------
+Thu Nov 7 00:06:36 UTC 2019 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Fix unresolvable status for openSUSE < 1550 where openmpi1 is
+ still called openmpi.
+
+-------------------------------------------------------------------
Old:
----
PHonon-5.1.2.tar.gz
atomic-5.1.2.tar.gz
espresso-5.1.2.tar.gz
espresso-implicit-pointer-decl.patch
neb-5.1.2.tar.gz
pwcond-5.1.2.tar.gz
quantum_espresso_add_ppc64le_archi_to_configure.patch
quantum_espresso_do_not_set_xlf_for_powerpc.patch
tddfpt-5.1.2.tar.gz
xspectra-5.1.2.tar.gz
New:
----
backports-6.4.1.git-diff
q-e-qe-6.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ quantum-espresso.spec ++++++
--- /var/tmp/diff_new_pack.ENR0zU/_old 2019-11-30 10:36:20.332179703 +0100
+++ /var/tmp/diff_new_pack.ENR0zU/_new 2019-11-30 10:36:20.332179703 +0100
@@ -23,28 +23,24 @@
%define _openmpi 1
%endif
+%if 0%{?suse_version} >= 1550
%define omp_ver 1
+%else
+%define omp_ver %{nil}
+%endif
%define _mpi %{?_openmpi:openmpi}%{omp_ver} %{?_mvapich2:mvapich2}
Name: quantum-espresso
-Version: 5.1.2
+Version: 6.4.1
Release: 0
Summary: A suite for electronic-structure calculations and materials modeling
License: GPL-2.0-only
Group: Productivity/Scientific/Physics
Url: http://www.quantum-espresso.org
-Source0: http://qe-forge.org/gf/download/frsrelease/185/753/espresso-%{version}.tar.…
-Source1: http://qe-forge.org/gf/download/frsrelease/185/760/neb-%{version}.tar.gz
-Source2: http://qe-forge.org/gf/download/frsrelease/185/755/PHonon-%{version}.tar.gz
-Source3: http://qe-forge.org/gf/download/frsrelease/185/756/pwcond-%{version}.tar.gz
-Source4: http://qe-forge.org/gf/download/frsrelease/185/752/atomic-%{version}.tar.gz
-Source5: http://qe-forge.org/gf/download/frsrelease/185/758/tddfpt-%{version}.tar.gz
-Source6: http://qe-forge.org/gf/download/frsrelease/185/757/xspectra-%{version}.tar.…
-# PATCH-FIX-UPSTREAM espresso-implicit-pointer-decl.patch
-Patch0: espresso-implicit-pointer-decl.patch
-Patch1: quantum_espresso_add_ppc64le_archi_to_configure.patch
-Patch2: quantum_espresso_do_not_set_xlf_for_powerpc.patch
+Source0: https://gitlab.com/QEF/q-e/-/archive/qe-%{version}/q-e-qe-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM backports-6.4.1.git-diff badshah400(a)gmail.com -- Backported fixes for version 6.4.1 from upstream
+Patch0: https://gitlab.com/QEF/q-e/wikis/uploads/3e4b6d3844989c02d0ebb03a935e1976/b…
BuildRequires: fdupes
BuildRequires: fftw3-devel
BuildRequires: gcc-fortran
@@ -56,7 +52,7 @@
BuildRequires: mvapich2-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ppc
+ExclusiveArch: x86_64
%description
Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
@@ -99,13 +95,7 @@
%endif
%prep
-%setup -q -n espresso-%{version}
-%setup -q -n espresso-%{version} -a1 -a2 -a3 -a5 -a4 -a6
-%patch0 -p1
-%ifarch ppc64 ppc64le
-%patch1 -p1
-%patch2 -p1
-%endif
+%autosetup -p1 -n q-e-qe-%{version}
echo "prepare parallel builds: %_mpi"
set -- *
@@ -152,18 +142,21 @@
%files
%defattr(-,root,root)
-%doc License README
+%doc README.md
+%license License
%{_bindir}/*.x
%files openmpi
%defattr(-,root,root)
-%doc License README
+%doc README.md
+%license License
%{_libdir}/mpi/gcc/openmpi%{omp_ver}/bin/*.x
%if 0%{?sles_version}
%files mvapich2
%defattr(-,root,root)
-%doc License README
+%doc README.md
+%license License
%{_libdir}/mpi/gcc/mvapich2/bin/*.x
%endif
++++++ backports-6.4.1.git-diff ++++++
diff --git a/FFTXlib/fft_types.f90 b/FFTXlib/fft_types.f90
index c0d56bf4e..8d66c2e8a 100644
--- a/FFTXlib/fft_types.f90
+++ b/FFTXlib/fft_types.f90
@@ -853,6 +853,7 @@ CONTAINS
SUBROUTINE realspace_grid_init( dfft, at, bg, gcutm, fft_fact )
!
! ... Sets optimal values for dfft%nr[123] and dfft%nr[123]x
+ ! ... If input dfft%nr[123] are non-zero, leaves them unchanged
! ... If fft_fact is present, force nr[123] to be multiple of fft_fac([123])
!
USE fft_support, only: good_fft_dimension, good_fft_order
@@ -876,28 +877,29 @@ CONTAINS
dfft%nr2 = int ( sqrt (gcutm) * sqrt (at(1, 2)**2 + at(2, 2)**2 + at(3, 2)**2) ) + 1
dfft%nr3 = int ( sqrt (gcutm) * sqrt (at(1, 3)**2 + at(2, 3)**2 + at(3, 3)**2) ) + 1
- !write (6,*) sqrt(gcutm)*sqrt(at(1,1)**2 + at(2,1)**2 + at(3,1)**2) , dfft%nr1
- !write (6,*) sqrt(gcutm)*sqrt(at(1,2)**2 + at(2,2)**2 + at(3,2)**2) , dfft%nr2
- !write (6,*) sqrt(gcutm)*sqrt(at(1,3)**2 + at(2,3)**2 + at(3,3)**2) , dfft%nr3
+#if defined (__DEBUG)
+ write (6,*) sqrt(gcutm)*sqrt(at(1,1)**2 + at(2,1)**2 + at(3,1)**2) , dfft%nr1
+ write (6,*) sqrt(gcutm)*sqrt(at(1,2)**2 + at(2,2)**2 + at(3,2)**2) , dfft%nr2
+ write (6,*) sqrt(gcutm)*sqrt(at(1,3)**2 + at(2,3)**2 + at(3,3)**2) , dfft%nr3
+#endif
!
CALL grid_set( dfft, bg, gcutm, dfft%nr1, dfft%nr2, dfft%nr3 )
!
+ IF ( PRESENT(fft_fact) ) THEN
+ dfft%nr1 = good_fft_order( dfft%nr1, fft_fact(1) )
+ dfft%nr2 = good_fft_order( dfft%nr2, fft_fact(2) )
+ dfft%nr3 = good_fft_order( dfft%nr3, fft_fact(3) )
+ ELSE
+ dfft%nr1 = good_fft_order( dfft%nr1 )
+ dfft%nr2 = good_fft_order( dfft%nr2 )
+ dfft%nr3 = good_fft_order( dfft%nr3 )
+ ENDIF
#if defined (__DEBUG)
ELSE
WRITE( stdout, '( /, 3X,"Info: using nr1, nr2, nr3 values from input" )' )
#endif
END IF
-
- IF (PRESENT(fft_fact)) THEN
- dfft%nr1 = good_fft_order( dfft%nr1, fft_fact(1) )
- dfft%nr2 = good_fft_order( dfft%nr2, fft_fact(2) )
- dfft%nr3 = good_fft_order( dfft%nr3, fft_fact(3) )
- ELSE
- dfft%nr1 = good_fft_order( dfft%nr1 )
- dfft%nr2 = good_fft_order( dfft%nr2 )
- dfft%nr3 = good_fft_order( dfft%nr3 )
- END IF
-
+ !
dfft%nr1x = good_fft_dimension( dfft%nr1 )
dfft%nr2x = dfft%nr2
dfft%nr3x = good_fft_dimension( dfft%nr3 )
diff --git a/PHonon/PH/bcast_ph_input.f90 b/PHonon/PH/bcast_ph_input.f90
index 6d8078c1b..4b454872a 100644
--- a/PHonon/PH/bcast_ph_input.f90
+++ b/PHonon/PH/bcast_ph_input.f90
@@ -42,6 +42,7 @@ subroutine bcast_ph_input ( )
USE YAMBO, ONLY : elph_yambo,dvscf_yambo
! YAMBO <
USE elph_tetra_mod, ONLY : lshift_q
+ USE ldaU_ph, ONLY : read_dns_bare, d2ns_type
implicit none
!
@@ -67,6 +68,7 @@ subroutine bcast_ph_input ( )
call mp_bcast (only_wfc, meta_ionode_id, world_comm )
call mp_bcast (only_init, meta_ionode_id, world_comm )
call mp_bcast (search_sym, meta_ionode_id, world_comm)
+ call mp_bcast (read_dns_bare, meta_ionode_id, world_comm)
! YAMBO >
call mp_bcast (elph_yambo, meta_ionode_id, world_comm)
call mp_bcast (dvscf_yambo, meta_ionode_id, world_comm)
@@ -119,6 +121,7 @@ subroutine bcast_ph_input ( )
call mp_bcast (tmp_dir, meta_ionode_id, world_comm )
call mp_bcast (prefix, meta_ionode_id, world_comm )
call mp_bcast (electron_phonon, meta_ionode_id, world_comm )
+ call mp_bcast (d2ns_type, meta_ionode_id, world_comm )
!
! derived type (one bit at a time)
!
diff --git a/PHonon/PH/dynmat_hub_bare.f90 b/PHonon/PH/dynmat_hub_bare.f90
index 0d57abcbc..22b932cb6 100644
--- a/PHonon/PH/dynmat_hub_bare.f90
+++ b/PHonon/PH/dynmat_hub_bare.f90
@@ -82,6 +82,8 @@ SUBROUTINE dynmat_hub_bare
!
CALL start_clock ( 'dynmat_hub_bare' )
!
+ ios = 0
+ !
ldim = 2*Hubbard_lmax + 1
!
ALLOCATE (dyn_hub_bare(3*nat,3*nat))
diff --git a/PHonon/PH/dynmat_hub_scf.f90 b/PHonon/PH/dynmat_hub_scf.f90
index 363327c2b..86c51f37c 100644
--- a/PHonon/PH/dynmat_hub_scf.f90
+++ b/PHonon/PH/dynmat_hub_scf.f90
@@ -118,7 +118,7 @@ SUBROUTINE dynmat_hub_scf (irr, nu_i0, nper)
! interrupted before the call of this routine)
!
IF (rec_code_read==10) THEN
- WRITE(stdout,*) 'rec_code_read', rec_code_read
+ !WRITE(stdout,*) 'rec_code_read', rec_code_read
CALL dnsq_scf (nper, lmetq0, nu_i0, irr, .true.)
ENDIF
!
diff --git a/PHonon/PH/phq_readin.f90 b/PHonon/PH/phq_readin.f90
index 57ed4dd3e..088044227 100644
--- a/PHonon/PH/phq_readin.f90
+++ b/PHonon/PH/phq_readin.f90
@@ -119,7 +119,7 @@ SUBROUTINE phq_readin()
elph_nbnd_min, elph_nbnd_max, el_ph_ngauss, &
el_ph_nsigma, el_ph_sigma, electron_phonon, &
q_in_band_form, q2d, qplot, low_directory_check, &
- lshift_q
+ lshift_q, read_dns_bare, d2ns_type
! tr2_ph : convergence threshold
! amass : atomic masses
diff --git a/PP/src/ppacf.f90 b/PP/src/ppacf.f90
index c7b5e9ef6..a55d6649f 100644
--- a/PP/src/ppacf.f90
+++ b/PP/src/ppacf.f90
@@ -58,6 +58,7 @@ PROGRAM do_ppacf
USE vdW_DF_scale, ONLY : xc_vdW_DF_ncc, xc_vdW_DF_spin_ncc, &
get_q0cc_on_grid, get_q0cc_on_grid_spin
USE vasp_xml, ONLY : readxmlfile_vasp
+ USE symm_base, ONLY : fft_fact
!
IMPLICIT NONE
@@ -217,9 +218,7 @@ PROGRAM do_ppacf
IF (code_num == 1) THEN
!
tmp_dir=TRIM(outdir)
-! CALL read_xml_file_internal(.TRUE.)
CALL read_file()
-
! Check exchange correlation functional
iexch = get_iexch()
icorr = get_icorr()
@@ -685,6 +684,7 @@ PROGRAM do_ppacf
DEALLOCATE ( igk_buf, gk )
!
! CALL setup()
+ fft_fact(:)=1
CALL exx_grid_init()
CALL exx_mp_init()
CALL exx_div_check()
diff --git a/PP/src/pw2wannier90.f90 b/PP/src/pw2wannier90.f90
index d9e2c870e..5d977a4f0 100644
--- a/PP/src/pw2wannier90.f90
+++ b/PP/src/pw2wannier90.f90
@@ -1162,7 +1162,7 @@ SUBROUTINE pw2wan_set_symm (nsym, sr, tvec)
!
! Uses nkqs and index_sym from module pw2wan, computes rir
!
- USE symm_base, ONLY : s, ftau, allfrac
+ USE symm_base, ONLY : s, ft, allfrac
USE fft_base, ONLY : dffts
USE cell_base, ONLY : at, bg
USE wannier, ONLY : rir, read_sym
@@ -1174,8 +1174,8 @@ SUBROUTINE pw2wan_set_symm (nsym, sr, tvec)
INTEGER , intent(in) :: nsym
REAL(DP) , intent(in) :: sr(3,3,nsym), tvec(3,nsym)
REAL(DP) :: st(3,3), v(3)
- INTEGER, allocatable :: s_in(:,:,:), ftau_in(:,:)
- !REAL(DP), allocatable:: ftau_in(:,:)
+ INTEGER, allocatable :: s_in(:,:,:)
+ REAL(DP), allocatable:: ft_in(:,:)
INTEGER :: nxxs, nr1,nr2,nr3, nr1x,nr2x,nr3x
INTEGER :: ikq, isym, i,j,k, ri,rj,rk, ir
LOGICAL :: ispresent(nsym)
@@ -1189,7 +1189,7 @@ SUBROUTINE pw2wan_set_symm (nsym, sr, tvec)
nxxs = nr1x*nr2x*nr3x
!
! sr -> s
- ALLOCATE(s_in(3,3,nsym), ftau_in(3,nsym))
+ ALLOCATE(s_in(3,3,nsym), ft_in(3,nsym))
IF(read_sym ) THEN
IF(allfrac) THEN
call errore("pw2wan_set_symm", "use_all_frac = .true. + read_sym = .true. not supported", 1)
@@ -1199,17 +1199,17 @@ SUBROUTINE pw2wan_set_symm (nsym, sr, tvec)
st = transpose( matmul(transpose(bg), transpose(sr(:,:,isym))) )
s_in(:,:,isym) = nint( matmul(transpose(at), st) )
v = matmul(transpose(bg), tvec(:,isym))
- ftau_in(1,isym) = nint(v(1)*nr1)
- ftau_in(2,isym) = nint(v(2)*nr2)
- ftau_in(3,isym) = nint(v(3)*nr3)
+ ft_in(1,isym) = v(1)
+ ft_in(2,isym) = v(2)
+ ft_in(3,isym) = v(3)
END DO
- IF( any(s(:,:,1:nsym) /= s_in(:,:,1:nsym)) .or. any(ftau_in(:,1:nsym) /= ftau(:,1:nsym)) ) THEN
+ IF( any(s(:,:,1:nsym) /= s_in(:,:,1:nsym)) .or. any(ft_in(:,1:nsym) /= ft(:,1:nsym)) ) THEN
write(stdout,*) " Input symmetry is different from crystal symmetry"
write(stdout,*)
END IF
ELSE
s_in = s(:,:,1:nsym)
- ftau_in = ftau(:,1:nsym)
+ ft_in = ft(:,1:nsym)
END IF
!
IF(.not. allocated(rir)) ALLOCATE(rir(nxxs,nsym))
@@ -1240,7 +1240,7 @@ SUBROUTINE pw2wan_set_symm (nsym, sr, tvec)
ENDDO
ENDDO
ENDDO
- DEALLOCATE(s_in, ftau_in)
+ DEALLOCATE(s_in, ft_in)
END SUBROUTINE pw2wan_set_symm
!-----------------------------------------------------------------------
@@ -4142,7 +4142,7 @@ SUBROUTINE write_parity
! 0-th Order
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! 1
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! 1
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
@@ -4150,21 +4150,21 @@ SUBROUTINE write_parity
! 1st Order
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! x
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! x
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! y
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! y
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! z
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! z
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
@@ -4172,63 +4172,63 @@ SUBROUTINE write_parity
! 2nd Order
IF ( (abs(g_abc(1,igv) - 2.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! x^2
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! x^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! xy
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! xy
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) + 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! xy
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! xy
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! xz
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! xz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! xz
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! xz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 2.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! y^2
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! y^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! yz
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! yz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! yz
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! yz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 2.d0 <= eps6) ) THEN ! z^2
+ (abs(g_abc(3,igv) - 2.d0) <= eps6) ) THEN ! z^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
@@ -4236,133 +4236,133 @@ SUBROUTINE write_parity
! 3rd Order
IF ( (abs(g_abc(1,igv) - 3.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! x^3
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! x^3
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 2.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! x^2y
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! x^2y
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 2.d0) <= eps6) .and. &
(abs(g_abc(2,igv) + 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! x^2y
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! x^2y
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 2.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! x^2z
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! x^2z
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 2.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! x^2z
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! x^2z
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 2.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! xy^2
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! xy^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) + 2.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! xy^2
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! xy^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! xyz
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! xyz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! xyz
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! xyz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) + 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! xyz
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! xyz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) + 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! xyz
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! xyz
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 2.d0 <= eps6) ) THEN ! xz^2
+ (abs(g_abc(3,igv) - 2.d0) <= eps6) ) THEN ! xz^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 1.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 2.d0 <= eps6) ) THEN ! xz^2
+ (abs(g_abc(3,igv) + 2.d0) <= eps6) ) THEN ! xz^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 3.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 0.d0 <= eps6) ) THEN ! y^3
+ (abs(g_abc(3,igv) - 0.d0) <= eps6) ) THEN ! y^3
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 2.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 1.d0 <= eps6) ) THEN ! y^2z
+ (abs(g_abc(3,igv) - 1.d0) <= eps6) ) THEN ! y^2z
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 2.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 1.d0 <= eps6) ) THEN ! y^2z
+ (abs(g_abc(3,igv) + 1.d0) <= eps6) ) THEN ! y^2z
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 2.d0 <= eps6) ) THEN ! yz^2
+ (abs(g_abc(3,igv) - 2.d0) <= eps6) ) THEN ! yz^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and.&
(abs(g_abc(2,igv) - 1.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) + 2.d0 <= eps6) ) THEN ! yz^2
+ (abs(g_abc(3,igv) + 2.d0) <= eps6) ) THEN ! yz^2
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
ENDIF
IF ( (abs(g_abc(1,igv) - 0.d0) <= eps6) .and. &
(abs(g_abc(2,igv) - 0.d0) <= eps6) .and. &
- (abs(g_abc(3,igv)) - 3.d0 <= eps6) ) THEN ! z^3
+ (abs(g_abc(3,igv) - 3.d0) <= eps6) ) THEN ! z^3
num_G(mpime+1) = num_G(mpime+1) + 1
ig_idx(num_G(mpime+1))=igv
CYCLE
diff --git a/PP/src/vasp_read_chgcar_mod.f90 b/PP/src/vasp_read_chgcar_mod.f90
index c5187e024..536f5344c 100644
--- a/PP/src/vasp_read_chgcar_mod.f90
+++ b/PP/src/vasp_read_chgcar_mod.f90
@@ -64,7 +64,6 @@ MODULE vasp_read_chgcar
INTEGER :: ngxf, ngyf, ngzf, nalloc
INTEGER :: ispin, iat, iz, ixy, nread
REAL(DP), ALLOCATABLE :: rho_r_(:,:), atomom(:)
- REAL(DP), ALLOCATABLE :: rho_r_up(:), rho_r_dn(:)
CHARACTER(LEN=80) :: errmsg
!
ierr = 0
@@ -102,15 +101,6 @@ MODULE vasp_read_chgcar
END DO
CLOSE(iunchg)
- IF(nspin==2) THEN
- ALLOCATE(rho_r_up(dfftp%nr1x*dfftp%nr2x*dfftp%nr3x))
- ALLOCATE(rho_r_dn(dfftp%nr1x*dfftp%nr2x*dfftp%nr3x))
- rho_r_up=0.5_DP*(rho_r_(:,1)+rho_r_(:,2))
- rho_r_dn=0.5_DP*(rho_r_(:,1)-rho_r_(:,2))
- rho_r_(:,1)=rho_r_up
- rho_r_(:,2)=rho_r_dn
- DEALLOCATE(rho_r_up, rho_r_dn)
- END IF
END IF
! CALL mp_bcast( atm, ionode_id, intra_image_comm )
DO ispin = 1, nspin
diff --git a/PW/src/setup.f90 b/PW/src/setup.f90
index 276588917..92543ddce 100644
--- a/PW/src/setup.f90
+++ b/PW/src/setup.f90
@@ -137,7 +137,7 @@ SUBROUTINE setup()
IF (ecutfock /= 4*ecutwfc) CALL infomsg &
('setup','Warning: US/PAW use ecutfock=4*ecutwfc, ecutfock ignored')
IF ( lmd .OR. lbfgs ) CALL errore &
- ('setup','forces for hybrid functionals + US/PAW not implemented')
+ ('setup','forces for hybrid functionals + US/PAW not implemented',1)
IF ( noncolin ) CALL errore &
('setup','Noncolinear hybrid XC for USPP not implemented',1)
END IF
@@ -519,7 +519,11 @@ SUBROUTINE setup()
!
! ... nosym: do not use any point-group symmetry (s(:,:,1) is the identity)
!
- IF ( nosym ) nsym = 1
+ IF ( nosym ) THEN
+ nsym = 1
+ invsym = .FALSE.
+ fft_fact(:) = 1
+ END IF
!
IF ( nsym > 1 .AND. ibrav == 0 ) CALL infomsg('setup', &
'DEPRECATED: symmetry with ibrav=0, use correct ibrav instead')
diff --git a/PW/src/symm_base.f90 b/PW/src/symm_base.f90
index 9d6cabf5c..4106be76a 100644
--- a/PW/src/symm_base.f90
+++ b/PW/src/symm_base.f90
@@ -515,11 +515,14 @@ SUBROUTINE sgam_at ( nat, tau, ityp, sym, no_z_inv)
!
! ft_ is in crystal axis and is a valid fractional translation
! only if ft_(i)=0 or ft_(i)=1/n, with n=2,3,4,6
- ! The check below is less strict: n must be integer
!
DO i=1,3
IF ( ABS (ft_(i)) > eps2 ) THEN
- ftaux(i) = ABS (1.0_dp/ft_(i) - NINT(1.0_dp/ft_(i)) )
+ ftaux(i) = ABS (1.0_dp/ft_(i) - NINT(1.0_dp/ft_(i)) )
+ nfrac = NINT(1.0_dp/ABS(ft_(i)))
+ IF ( ftaux(i) < eps2 .AND. nfrac /= 2 .AND. &
+ nfrac /= 3 .AND. nfrac /= 4 .AND. nfrac /= 6 ) &
+ ftaux(i) = 2*eps2
ELSE
ftaux(i) = 0.0_dp
END IF
diff --git a/PW/src/v_of_rho.f90 b/PW/src/v_of_rho.f90
index 7782924f1..295da64fe 100644
--- a/PW/src/v_of_rho.f90
+++ b/PW/src/v_of_rho.f90
@@ -221,7 +221,7 @@ SUBROUTINE v_xc_meta( rho, rho_core, rhog_core, etxc, vtxc, v, kedtaur )
! spin-polarised case
!
rhoup = ( rho%of_r(k, 1) + rho%of_r(k, 2) )*0.5d0
- rhodw = ( rho%of_r(k, 2) - rho%of_r(k, 2) )*0.5d0
+ rhodw = ( rho%of_r(k, 1) - rho%of_r(k, 2) )*0.5d0
rh = rhoup + rhodw
1
0