October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source-longterm for openSUSE:Factory
by Source-Sync 06 Oct '24

06 Oct '24

1 0

commit qcoro for openSUSE:Factory
by Source-Sync 06 Oct '24

06 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qcoro for openSUSE:Factory checked in at 2024-10-06 17:51:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qcoro (Old) and /work/SRC/openSUSE:Factory/.qcoro.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qcoro" Sun Oct 6 17:51:12 2024 rev:11 rq:1205765 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qcoro/qcoro.changes 2024-02-01 18:03:56.431993840 +0100 +++ /work/SRC/openSUSE:Factory/.qcoro.new.19354/qcoro.changes 2024-10-06 17:51:15.955344449 +0200 @@ -1,0 +2,21 @@ +Fri Oct 4 21:37:21 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 0.11.0 + * Suppress Clang error when building against Android NDK <= 25 + * Add QtGui dependency if QCORO_WITH_QTQUICK=ON + * Fix wrong result of QCoroIODevice::write() + * Add override to fix build failure due to -Werror -Wsuggest-override + * Fix coroutine being resumed on a wrong thread after timeout + * Implement QCoroFuture::takeResult + * #include , needed by std::exception_ptr + * waitFor(QCoro::Task): Do not require T to be default + constructible + * Add QCORO_BUILD_TESTING to allow overriding BUILD_TESTING + * Use refcount to track when to destroy coroutine + * Drop support for older compilers + * Implement LazyTask + * Use QueuedConnection for signals in QCoroNetworkReply + * Awaiting a default-constructed or moved-from Task will hang + * Add a backround task example + +------------------------------------------------------------------- Old: ---- qcoro-0.10.0.tar.gz New: ---- qcoro-0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qcoro.spec ++++++ --- /var/tmp/diff_new_pack.fTNzLx/_old 2024-10-06 17:51:16.475366059 +0200 +++ /var/tmp/diff_new_pack.fTNzLx/_new 2024-10-06 17:51:16.479366225 +0200 @@ -1,7 +1,7 @@ # # spec file for package qcoro # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,7 @@ %endif # Name: qcoro%{?_pkg_name_suffix} -Version: 0.10.0 +Version: 0.11.0 Release: 0 Summary: Coroutines for Qt License: MIT @@ -55,15 +55,15 @@ BuildRequires: cmake(Qt%{_qt_suffix}Core) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}DBus) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}Network) >= %{qt_min_version} -BuildRequires: cmake(Qt%{_qt_suffix}Quick) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}Qml) >= %{qt_min_version} +BuildRequires: cmake(Qt%{_qt_suffix}Quick) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}Test) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}WebSockets) >= %{qt_min_version} BuildRequires: cmake(Qt%{_qt_suffix}Widgets) >= %{qt_min_version} # C++-20 support is required %if 0%{?qt5} && 0%{?suse_version} < 1550 -BuildRequires: gcc13-c++ BuildRequires: gcc13-PIE +BuildRequires: gcc13-c++ %endif %description ++++++ qcoro-0.10.0.tar.gz -> qcoro-0.11.0.tar.gz ++++++ ++++ 2824 lines of diff (skipped)

1 0

commit apache-commons-io for openSUSE:Factory
by Source-Sync 06 Oct '24

06 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-commons-io for openSUSE:Factory checked in at 2024-10-06 17:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-io (Old) and /work/SRC/openSUSE:Factory/.apache-commons-io.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-io" Sun Oct 6 17:51:10 2024 rev:23 rq:1205749 version:2.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-io/apache-commons-io.changes 2024-05-03 19:43:23.430322664 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-io.new.19354/apache-commons-io.changes 2024-10-06 17:51:13.399238227 +0200 @@ -1,0 +2,87 @@ +Fri Oct 4 19:23:58 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to 2.17.0 + * New features: + + Add IOIterator.adapt(Iterable) + + Add getInputStream() for 'https' and 'http' in URIOrigin + #630. Fixes IO-831 + + Add IOSupplier.getUnchecked() + + Add CloseShieldInputStream.systemIn(InputStream) + + Add NullInputStream.init() + + Add AbstractInputStream and refactor duplicate code + + Add UnsynchronizedReader + + Add UnsynchronizedBufferedReader + * Fixes: + + FileUtilsWaitForTest does not test anything useful. + Fixes IO-858. + + Add missing unit tests + + FileUtils.lastModifiedFileTime(File) calls + Objects.requireNonNull() on the wrong object + + PathUtils.deleteOnExit(Path) calls Objects.requireNonNull() + on the wrong object + + Deprecate LineIterator.nextLine() in favor of next() + + Fix PMD UnnecessaryFullyQualifiedName + + Add test for CircularByteBuffer clear() #620 + + PathUtils.isPosix(Path, LinkOption...) should return false on + null input + + AutoCloseInputStream(InputStream) uses + ClosedInputStream.INSTANCE when its input is null + + Avoid NullPointerException in ProxyInputStream.available() + when the underlying input stream is null + + Avoid NullPointerException in ProxyInputStream.markSupported() + when the underlying input stream is null + + Avoid NullPointerException in ProxyInputStream.mark(int) when + the underlying input stream is null + + BufferedFileChannelInputStream.available() returns 0 before + any reads + + BufferedFileChannelInputStream.available() should return 0 + instead of -1 at the end of the stream + + BufferedFileChannelInputStream.available() should return 0 + when the stream is closed instead of throwing an exception + + CharSequenceInputStream.available() should return 0 after the + stream is closed + + BoundedInputStream.available() should return 0 when the + stream is closed + + CircularInputStream.available() should return 0 when the + stream is closed + + InfiniteCircularInputStream.available() should return 0 when + the stream is closed + + ChecksumInputStream(InputStream, Checksum, long, long) should + fail-fast on null Checksum input + + Deprecate NullInputStream.INSTANCE in favor of constructors + + NullInputStream.available() should return 0 after the stream + is closed + + MemoryMappedFileInputStream.available() should return 0 after + the stream is closed + + RandomAccessFileInputStream.available() should return 0 after + the stream is closed + + ReaderInputStream.available() should return 0 after the + stream is closed + + AutoCloseInputStream does not call handleIOException() on + close() when the proxied stream throws an IOException + + BoundedInputStream does not call handleIOException() on + close() when the proxied stream throws an IOException + + NullInputStream.read(*) should throw IOException when it is + closed + + NullInputStream.read(byte[]) should return 0 when the input + byte array in length 0 + + NullInputStream.read(byte[], int, int) should return 0 when + the input byte array in length 0 or requested length is 0 + + MarkShieldInputStream.read(*) should throw IOException when + it is closed + + Replace deprecated constant FileFileFilter.FILE in Javadoc + #657 + + Pick up exec-maven-plugin version from parent POM + * Updates: + + Bump tests commons.bytebuddy.version from 1.14.13 to 1.15.1 + #615, #621, #631, #635, #642, #658, #663, #665 + + Bump tests commons-codec:commons-codec from 1.16.1 to 1.17.1 + #644 + + Bump org.codehaus.mojo:exec-maven-plugin from 3.2.0 to 3.4.1 + #632, #652, #659 + + Bump org.apache.commons:commons-parent from 69 to 74 #628, + #637, #649, #661, #664 + + Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 + #645, #653, #666 + +------------------------------------------------------------------- Old: ---- commons-io-2.16.1-src.tar.gz commons-io-2.16.1-src.tar.gz.asc New: ---- apache-commons-io.keyring commons-io-2.17.0-src.tar.gz commons-io-2.17.0-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-io.spec ++++++ --- /var/tmp/diff_new_pack.8rpCO3/_old 2024-10-06 17:51:15.479324668 +0200 +++ /var/tmp/diff_new_pack.8rpCO3/_new 2024-10-06 17:51:15.483324834 +0200 @@ -19,7 +19,7 @@ %define base_name io %define short_name commons-%{base_name} Name: apache-%{short_name} -Version: 2.16.1 +Version: 2.17.0 Release: 0 Summary: Utilities to assist with developing IO functionality License: Apache-2.0 @@ -28,6 +28,7 @@ Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%… Source1: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%… Source2: %{name}-build.xml +Source100: https://downloads.apache.org/commons/KEYS#/%{name}.keyring BuildRequires: ant >= 1.6 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 ++++++ apache-commons-io-build.xml ++++++ --- /var/tmp/diff_new_pack.8rpCO3/_old 2024-10-06 17:51:15.515326164 +0200 +++ /var/tmp/diff_new_pack.8rpCO3/_new 2024-10-06 17:51:15.519326330 +0200 @@ -10,7 +10,7 @@ <property name="project.groupId" value="commons-io"/> <property name="project.artifactId" value="commons-io"/> - <property name="project.version" value="2.16.1"/> + <property name="project.version" value="2.17.0"/> <property name="project.name" value="Apache Commons IO"/> <property name="project.description" value="The Apache Commons IO library contains utility classes, stream implementations, file filters, ++++++ apache-commons-io.keyring ++++++ ++++ 10346 lines (skipped) ++++++ commons-io-2.16.1-src.tar.gz -> commons-io-2.17.0-src.tar.gz ++++++ ++++ 10499 lines of diff (skipped)

1 0

commit javapackages-tools for openSUSE:Factory
by Source-Sync 06 Oct '24

06 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2024-10-06 17:51:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javapackages-tools" Sun Oct 6 17:51:08 2024 rev:43 rq:1205748 version:6.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2024-10-04 17:08:35.431940221 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.19354/javapackages-tools.changes 2024-10-06 17:51:10.491117377 +0200 @@ -1,0 +2,21 @@ +Fri Oct 4 17:08:37 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream version 6.3.2 + * Changes + + spec: Update Obsoletes versions + + Search for JAVACMD under JAVA_HOME only if it's set + + Obsolete set_jvm and set_jvm_dirs functions + + Drop unneeded _set_java_home function + + Remove JAVA_HOME check from check_java_env function + + Bump codecov/codecov-action from 2.0.2 to 4.6.0 + + Bump actions/setup-python from 4 to 5 + + Bump actions/checkout from 2 to 4 + + Add custom dependabot config + + Remove the test for JAVA_HOME and error if it is not set + + java-functions: Remove unneeded local variables + + Fix build status shield +- Removed patch: + * 0001-Double-quote-to-avoid-substitution-during-build.patch + + Fixed differently in this version + +------------------------------------------------------------------- Old: ---- 0001-Double-quote-to-avoid-substitution-during-build.patch 6.3.1.tar.gz New: ---- 6.3.2.tar.gz BETA DEBUG BEGIN: Old:- Removed patch: * 0001-Double-quote-to-avoid-substitution-during-build.patch + Fixed differently in this version BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.g4jCgk/_old 2024-10-06 17:51:12.491200493 +0200 +++ /var/tmp/diff_new_pack.g4jCgk/_new 2024-10-06 17:51:12.495200659 +0200 @@ -30,7 +30,7 @@ %else Name: javapackages-tools %endif -Version: 6.3.1 +Version: 6.3.2 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause @@ -45,7 +45,6 @@ #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch -Patch3: 0001-Double-quote-to-avoid-substitution-during-build.patch BuildRequires: fdupes BuildRequires: perl ++++++ 6.3.1.tar.gz -> 6.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/.github/dependabot.yml new/javapackages-6.3.2/.github/dependabot.yml --- old/javapackages-6.3.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/javapackages-6.3.2/.github/dependabot.yml 2024-10-04 12:02:35.000000000 +0200 @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/.github/workflows/ci.yml new/javapackages-6.3.2/.github/workflows/ci.yml --- old/javapackages-6.3.1/.github/workflows/ci.yml 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/.github/workflows/ci.yml 2024-10-04 12:02:35.000000000 +0200 @@ -26,9 +26,9 @@ runs-on: ubuntu-24.04 steps: - name: Checkout git repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install required Python packages @@ -38,4 +38,4 @@ - name: Run check script run: ./check - name: Upload coverage report to Codecov - uses: codecov/codecov-action(a)v2.0.2 + uses: codecov/codecov-action(a)v4.6.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/README.md new/javapackages-6.3.2/README.md --- old/javapackages-6.3.1/README.md 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/README.md 2024-10-04 12:02:35.000000000 +0200 @@ -1,4 +1,4 @@ -[![build status](https://img.shields.io/github/workflow/status/fedora-java/javapacka… [![test coverage](https://img.shields.io/codecov/c/github/fedora-java/javapackages/master.svg)](https://codecov.io/gh/fedora-java/javapackages) +[![build status](https://img.shields.io/github/actions/workflow/status/fedora-java/j… [![test coverage](https://img.shields.io/codecov/c/github/fedora-java/javapackages/master.svg)](https://codecov.io/gh/fedora-java/javapackages) Java Packages Tools is a collection of tools that make it easier to build RPM packages containing software running on the Java platform. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/java-utils/java-functions new/javapackages-6.3.2/java-utils/java-functions --- old/javapackages-6.3.1/java-utils/java-functions 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/java-utils/java-functions 2024-10-04 12:02:35.000000000 +0200 @@ -124,33 +124,9 @@ } -# Test default JRE/JVM roots if nothing is defined yet -_set_java_home() -{ - local IFS=: - local jvmdir - - if [ -n "${JAVA_HOME}" ]; then - return - fi - - unset JAVA_HOME -} - -# Set the java virtual machine +# Obsolete, does nothing set_jvm() { - local IFS=: - local javaconfdirs - - _set_java_home - - if [ -z "${JAVA_HOME}" ]; then - javaconfdirs="${JAVACONFDIRS:-@{javaconfdir}}" - _err "JAVA_HOME is not set and default java installation was not found. JAVA_HOME for system applications can be set in java.conf in ${javaconfdirs}" - exit 1 - fi - return 0 } @@ -159,8 +135,6 @@ { local IFS - _set_java_home - # get local classpath first set -- "${@}" ${ADDITIONAL_JARS} LOCAL_CLASSPATH=$("@{bindir}/build-classpath" "${@}") @@ -178,22 +152,22 @@ return fi - set_jvm - # Add all sorts of jvm layouts here - for cmd in jre/sh/java jre/bin/java bin/java; do - JAVACMD="${JAVA_HOME}/${cmd}" - if [ -x "${JAVACMD}" ]; then - _log "Using configured JAVACMD: $JAVACMD" - if [ -n "${JAVACMD_OPTS}" ]; then - _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" - export _JP_JAVACMD="${JAVACMD}" - export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" - JAVACMD="@{javadir}-utils/java-wrapper" - fi - return 0 - fi - done + if [ -n "${JAVA_HOME}" ]; then + for cmd in jre/sh/java jre/bin/java bin/java; do + JAVACMD="${JAVA_HOME}/${cmd}" + if [ -x "${JAVACMD}" ]; then + _log "Using configured JAVACMD: $JAVACMD" + if [ -n "${JAVACMD_OPTS}" ]; then + _log "Using java-wrapper with extra options: ${JAVACMD_OPTS}" + export _JP_JAVACMD="${JAVACMD}" + export _JP_JAVACMD_OPTS="${JAVACMD_OPTS}" + JAVACMD="@{javadir}-utils/java-wrapper" + fi + return 0 + fi + done + fi JAVACMD=$(which java 2>/dev/null || :) if [ -x "${JAVACMD}" ]; then @@ -251,11 +225,9 @@ eval "exec \"\${JAVACMD}\" ${FLAGS} -classpath \"\${CLASSPATH}\" ${OPTIONS} \"\${MAIN_CLASS}\" \"\${@}\"" } -# Set JVM-related directories +# Obsolete, does nothing set_jvm_dirs() { - _set_java_home - return 0 } @@ -390,12 +362,6 @@ ## Checks java environment check_java_env() { - # This is usually set by set_jvm - if [ -z "${JAVA_HOME}" ]; then - _err "JAVA_HOME must be set" - return 1 - fi - if [ -z "${JAVACMD}" ]; then _err "JAVACMD must be set" return 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/javapackages-tools.spec new/javapackages-6.3.2/javapackages-tools.spec --- old/javapackages-6.3.1/javapackages-tools.spec 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/javapackages-tools.spec 2024-10-04 12:02:35.000000000 +0200 @@ -64,7 +64,7 @@ Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) # Remove in Fedora 45 -Obsoletes: maven-local < 7 +Obsoletes: maven-local < 6.3.0 Obsoletes: maven-local-openjdk8 < 6.2.0-29 Obsoletes: maven-local-openjdk11 < 6.2.0-29 Obsoletes: maven-local-openjdk17 < 6.2.0-29 @@ -95,14 +95,14 @@ %package -n javapackages-local-openjdk21 Summary: Non-essential macros and scripts for Java packaging support -Obsoletes: javapackages-local < 7 +Obsoletes: javapackages-local < 6.3.0 Provides: javapackages-local = %{version}-%{release} Requires: javapackages-common = %{version}-%{release} Requires: xmvn-tools # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-21-openjdk-devel Requires: xmvn-generator -Obsoletes: javapackages-generators < 7 +Obsoletes: javapackages-generators < 6.3.0 %description -n javapackages-local-openjdk21 This package provides non-essential macros and scripts to support Java packaging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-6.3.1/macros.d/macros.jpackage new/javapackages-6.3.2/macros.d/macros.jpackage --- old/javapackages-6.3.1/macros.d/macros.jpackage 2024-09-29 20:41:29.000000000 +0200 +++ new/javapackages-6.3.2/macros.d/macros.jpackage 2024-10-04 12:02:35.000000000 +0200 @@ -59,7 +59,6 @@ BASE_JARS="%(echo %4 | sed -e 's,:, ,g')"\ \ # Set parameters\ -set_jvm\ set_classpath \\$BASE_JARS\ set_flags \\$BASE_FLAGS\ set_options \\$BASE_OPTIONS\

1 0

commit 000update-repos for openSUSE:Factory
by Source-Sync 05 Oct '24

05 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2024-10-05 21:04:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Sat Oct 5 21:04:17 2024 rev:2601 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- factory:non-oss_4160.2.packages.zst factory_20241003.packages.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 000product for openSUSE:Factory
by Source-Sync 04 Oct '24

04 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2024-10-05 01:16:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sat Oct 5 01:16:26 2024 rev:4161 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.476422632 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.480422800 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__MicroOS___20241003" schemaversion="4.1"> +<image name="OBS__MicroOS___20241004" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20241003</productvar> + <productvar name="VERSION">20241004</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:microos:20241003,openSUSE MicroOS</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:microos:20241004,openSUSE MicroOS</productinfo> <productinfo name="LINGUAS">en_US </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20241003/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20241004/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.516424299 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.524424633 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Addon-NonOss___20241003" schemaversion="4.1"> +<image name="OBS__openSUSE-Addon-NonOss___20241004" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20241003</productvar> + <productvar name="VERSION">20241004</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20241003,openSUSE NonOSS Addon</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20241004,openSUSE NonOSS Addon</productinfo> <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2024…</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2024…</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ openSUSE-cd-mini-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.552425800 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.556425966 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20241003" schemaversion="4.1"> +<image name="OBS__openSUSE___20241004" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20241003</productvar> + <productvar name="VERSION">20241004</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20241003,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20241004,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20241003/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20241004/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ openSUSE-ftp-ftp-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.620428634 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.624428801 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20241003" schemaversion="4.1"> +<image name="OBS__openSUSE___20241004" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -23,7 +23,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20241003-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20241004-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -35,11 +35,11 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20241003</productvar> + <productvar name="VERSION">20241004</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20241003,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20241004,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo> - <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20241003/x86_64</productinfo> + <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20241004/x86_64</productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption> ++++++ Aeon.product ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.680431135 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.684431301 +0200 @@ -6,7 +6,7 @@ <name>Aeon</name> <releasepkgname>Aeon-release</releasepkgname> <endoflife/> - <version>20241003</version> + <version>20241004</version>  <release>0</release> <productline>Aeon</productline> ++++++ Kalpa.product ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.704432135 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.708432302 +0200 @@ -6,7 +6,7 @@ <name>Kalpa</name> <releasepkgname>Kalpa-release</releasepkgname> <endoflife/> - <version>20241003</version> + <version>20241004</version>  <release>0</release> <productline>Kalpa</productline> ++++++ MicroOS.product ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.732433302 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.736433468 +0200 @@ -6,7 +6,7 @@ <name>MicroOS</name> <releasepkgname>MicroOS-release</releasepkgname> <endoflife/> - <version>20241003</version> + <version>20241004</version>  <release>0</release> <productline>MicroOS</productline> ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.868438971 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.872439137 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:33.896440137 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:33.900440303 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <productline>openSUSE</productline> ++++++ unsorted.yml ++++++ --- /var/tmp/diff_new_pack.EARMH7/_old 2024-10-05 01:16:34.020445305 +0200 +++ /var/tmp/diff_new_pack.EARMH7/_new 2024-10-05 01:16:34.028445638 +0200 @@ -11628,6 +11628,7 @@ - libWN3 - libWPEBackend-fdo-1_0-1 - libWPEBackend-fdo-1_0-1-32bit + - libWPEPlatform-2_0-0 - libWPEWebInspectorResources - libWPEWebKit-2_0-1 - libWildMidi2 @@ -25407,6 +25408,7 @@ - python310-environ-config - python310-environmental-override - python310-envisage + - python310-envs - python310-enzyme - python310-ephem - python310-ephemeral-port-reserve @@ -27018,7 +27020,6 @@ - python310-pyviz-comms - python310-pyvmomi - python310-pyvo - - python310-pywal - python310-pywayland - python310-pywbem - python310-pywbemtools @@ -29057,6 +29058,7 @@ - python311-environ-config - python311-environmental-override - python311-envisage + - python311-envs - python311-enzyme - python311-ephem - python311-ephemeral-port-reserve @@ -30603,7 +30605,6 @@ - python311-pyviz-comms - python311-pyvmomi - python311-pyvo - - python311-pywal - python311-pywayland - python311-pywbem - python311-pywbemtools @@ -32661,6 +32662,7 @@ - python312-environ-config - python312-environmental-override - python312-envisage + - python312-envs - python312-enzyme - python312-ephem - python312-ephemeral-port-reserve @@ -34270,7 +34272,6 @@ - python312-pyviz-comms - python312-pyvmomi - python312-pyvo - - python312-pywal - python312-pywayland - python312-pywbem - python312-pywbemtools

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 04 Oct '24

04 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2024-10-04 17:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Oct 4 17:41:32 2024 rev:3137 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2024-10-04 08:17:21.533383938 +0200 +++ /work/SRC/openSUSE:Factory/.000release-packages.new.19354/Aeon-release.changes 2024-10-04 17:41:34.830623460 +0200 @@ -2 +2 @@ -Fri Oct 04 06:17:18 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> +Fri Oct 04 15:41:30 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> Kalpa-release.changes: same change MicroOS-release.changes: same change openSUSE-Addon-NonOss-release.changes: same change openSUSE-release.changes: same change stub.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Aeon-release.spec ++++++ --- /var/tmp/diff_new_pack.KVBSgz/_old 2024-10-04 17:41:36.998714036 +0200 +++ /var/tmp/diff_new_pack.KVBSgz/_new 2024-10-04 17:41:36.998714036 +0200 @@ -17,7 +17,7 @@ Name: Aeon-release -Version: 20241003 +Version: 20241004 Release: 0 Summary: Aeon License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Aeon -Provides: product(Aeon) = 20241003-0 +Provides: product(Aeon) = 20241004-0 Provides: product-label() = Aeon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20241003 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20241004 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(Aeon) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Aeon) = 20241003-0 +Provides: product_flavor(Aeon) = 20241004-0 Summary: Aeon%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Aeon</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:aeon:20241003</cpeid> + <cpeid>cpe:/o:opensuse:aeon:20241004</cpeid> <productline>Aeon</productline> <register> <pool> ++++++ Kalpa-release.spec ++++++ --- /var/tmp/diff_new_pack.KVBSgz/_old 2024-10-04 17:41:37.030715373 +0200 +++ /var/tmp/diff_new_pack.KVBSgz/_new 2024-10-04 17:41:37.030715373 +0200 @@ -17,7 +17,7 @@ Name: Kalpa-release -Version: 20241003 +Version: 20241004 Release: 0 Summary: openSUSE Kalpa License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Kalpa -Provides: product(Kalpa) = 20241003-0 +Provides: product(Kalpa) = 20241004-0 Provides: product-label() = openSUSE%20Kalpa -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20241003 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20241004 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(Kalpa) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Kalpa) = 20241003-0 +Provides: product_flavor(Kalpa) = 20241004-0 Summary: openSUSE Kalpa%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Kalpa</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:kalpa:20241003</cpeid> + <cpeid>cpe:/o:opensuse:kalpa:20241004</cpeid> <productline>Kalpa</productline> <register> <pool> ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.KVBSgz/_old 2024-10-04 17:41:37.070717044 +0200 +++ /var/tmp/diff_new_pack.KVBSgz/_new 2024-10-04 17:41:37.070717044 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20241003 +Version: 20241004 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -179,9 +179,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20241003-0 +Provides: product(MicroOS) = 20241004-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20241003 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20241004 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -197,7 +197,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20241003-0 +Provides: product_flavor(MicroOS) = 20241004-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20241003-0 +Provides: product_flavor(MicroOS) = 20241004-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -278,11 +278,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20241003</cpeid> + <cpeid>cpe:/o:opensuse:microos:20241004</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.KVBSgz/_old 2024-10-04 17:41:37.106718548 +0200 +++ /var/tmp/diff_new_pack.KVBSgz/_new 2024-10-04 17:41:37.106718548 +0200 @@ -18,7 +18,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss -Version: 20241003 +Version: 20241004 #!BcntSyncTag: openSUSE-Addon-NonOss Release: 0 Summary: openSUSE NonOSS Addon @@ -26,9 +26,9 @@ Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20241003-0 +Provides: product(openSUSE-Addon-NonOss) = 20241004-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20241003 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20241004 @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20241003</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20241004</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.KVBSgz/_old 2024-10-04 17:41:37.134719718 +0200 +++ /var/tmp/diff_new_pack.KVBSgz/_new 2024-10-04 17:41:37.134719718 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20241003 +Version: 20241004 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -185,7 +185,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20241003-0 +Provides: product(openSUSE) = 20241004-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -199,7 +199,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20241003 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20241004 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -228,7 +228,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -243,7 +243,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -258,7 +258,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -273,7 +273,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -288,7 +288,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -303,7 +303,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -318,7 +318,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -333,7 +333,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -348,7 +348,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -363,7 +363,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -378,7 +378,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -393,7 +393,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -408,7 +408,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -423,7 +423,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -438,7 +438,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -453,7 +453,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -468,7 +468,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -483,7 +483,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20241003-0 +Provides: product_flavor(openSUSE) = 20241004-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -566,10 +566,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20241003</version> + <version>20241004</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20241003</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20241004</cpeid> <productline>openSUSE</productline> <register> <target>openSUSE-Tumbleweed-x86_64</target>

1 0

commit python-terminaltables for openSUSE:Factory
by Source-Sync 04 Oct '24

04 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-terminaltables for openSUSE:Factory checked in at 2024-10-04 17:13:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-terminaltables (Old) and /work/SRC/openSUSE:Factory/.python-terminaltables.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-terminaltables" Fri Oct 4 17:13:30 2024 rev:4 rq:1205696 version:3.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/python-terminaltables/python-terminaltables.changes 2024-02-08 19:05:32.094442181 +0100 +++ /work/SRC/openSUSE:Factory/.python-terminaltables.new.19354/python-terminaltables.changes 2024-10-04 17:13:31.656314641 +0200 @@ -1,0 +2,5 @@ +Fri Oct 4 07:52:27 UTC 2024 - ecsos <ecsos(a)opensuse.org> + +- Add %{?sle15_python_module_pythons} + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-terminaltables.spec ++++++ --- /var/tmp/diff_new_pack.CJBisx/_old 2024-10-04 17:13:32.960369103 +0200 +++ /var/tmp/diff_new_pack.CJBisx/_new 2024-10-04 17:13:32.964369271 +0200 @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?sle15_python_module_pythons} Name: python-terminaltables Version: 3.1.10 Release: 0

1 0

commit glab for openSUSE:Factory
by Source-Sync 04 Oct '24

04 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glab for openSUSE:Factory checked in at 2024-10-04 17:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glab (Old) and /work/SRC/openSUSE:Factory/.glab.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glab" Fri Oct 4 17:11:22 2024 rev:34 rq:1205722 version:1.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glab/glab.changes 2024-09-11 16:57:29.319284125 +0200 +++ /work/SRC/openSUSE:Factory/.glab.new.19354/glab.changes 2024-10-04 17:11:41.707721868 +0200 @@ -1,0 +2,28 @@ +Thu Oct 03 10:04:45 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.47.0: + * feat(stacked-diffs): Add origin fetch so sync will fully + pull+push + * docs: revise token-create page lightly + * feat(stack): introduce stack list command + * fix: use conventional linux package and archive file names + * chore(ci): run build_windows asap + * fix(stacked-diffs): fix MR creation for forks + * feat: cluster agent bootstrap command + * fix: glab mr view prompt disabled if NO_PROMPT is set with + multiple mr + * chore: insert commit subject + body to MR template descriptions + * chore: increase size of CI runners + * chore: optimize pipeline runtime + * feat: create personal, project or group tokens + * chore(deps): update @commitlint/config-conventional to ^19.5.0 + * fix(repo clone): fix --with-shared behaviour + * chore: bump code intel component to v0.0.3 + * chore(deps): update module k8s.io/client-go to v0.31.1 + * chore(deps): update dependency @commitlint/lint to ^19.5.0 + * fix: revise docker image dependencies + * chore(deps): update dependency @commitlint/format to ^19.5.0 + * chore(deps): update golang to v1.23.1 + * chore(deps): update module golang.org/x/oauth2 to v0.23.0 + +------------------------------------------------------------------- Old: ---- glab-1.46.1.obscpio New: ---- glab-1.47.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glab.spec ++++++ --- /var/tmp/diff_new_pack.ET6NiZ/_old 2024-10-04 17:11:42.391750444 +0200 +++ /var/tmp/diff_new_pack.ET6NiZ/_new 2024-10-04 17:11:42.395750611 +0200 @@ -20,7 +20,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: glab -Version: 1.46.1 +Version: 1.47.0 Release: 0 Summary: A GitLab command line tool License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ET6NiZ/_old 2024-10-04 17:11:42.427751948 +0200 +++ /var/tmp/diff_new_pack.ET6NiZ/_new 2024-10-04 17:11:42.431752115 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="manual"> <param name="url">https://gitlab.com/gitlab-org/cli.git</param> <param name="scm">git</param> - <param name="revision">v1.46.1</param> + <param name="revision">v1.47.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="filename">glab</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ET6NiZ/_old 2024-10-04 17:11:42.455753117 +0200 +++ /var/tmp/diff_new_pack.ET6NiZ/_new 2024-10-04 17:11:42.459753284 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.com/gitlab-org/cli.git</param> - <param name="changesrevision">3280dd8c135061e5e496e9ff168394fcad033ae7</param></service></servicedata> + <param name="changesrevision">d98a9c0ff48eaaf7621cf7426dd4ac387f5bf7ff</param></service></servicedata> (No newline at EOF) ++++++ glab-1.46.1.obscpio -> glab-1.47.0.obscpio ++++++ /work/SRC/openSUSE:Factory/glab/glab-1.46.1.obscpio /work/SRC/openSUSE:Factory/.glab.new.19354/glab-1.47.0.obscpio differ: char 49, line 1 ++++++ glab.obsinfo ++++++ --- /var/tmp/diff_new_pack.ET6NiZ/_old 2024-10-04 17:11:42.515755623 +0200 +++ /var/tmp/diff_new_pack.ET6NiZ/_new 2024-10-04 17:11:42.515755623 +0200 @@ -1,5 +1,5 @@ name: glab -version: 1.46.1 -mtime: 1725998266 -commit: 3280dd8c135061e5e496e9ff168394fcad033ae7 +version: 1.47.0 +mtime: 1727871778 +commit: d98a9c0ff48eaaf7621cf7426dd4ac387f5bf7ff ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/glab/vendor.tar.gz /work/SRC/openSUSE:Factory/.glab.new.19354/vendor.tar.gz differ: char 5, line 1

1 0

commit evdi for openSUSE:Factory
by Source-Sync 04 Oct '24

04 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package evdi for openSUSE:Factory checked in at 2024-10-04 17:11:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evdi (Old) and /work/SRC/openSUSE:Factory/.evdi.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evdi" Fri Oct 4 17:11:15 2024 rev:8 rq:1205677 version:1.14.7 Changes: -------- --- /work/SRC/openSUSE:Factory/evdi/evdi.changes 2024-08-02 17:28:07.819266686 +0200 +++ /work/SRC/openSUSE:Factory/.evdi.new.19354/evdi.changes 2024-10-04 17:11:38.471586679 +0200 @@ -1,0 +2,16 @@ +Fri Oct 04 11:15:59 UTC 2024 - joan.torres(a)suse.com + +- Update to version 1.14.7: + * Set version to 1.14.7 + * Fix venv for pytest.run.sh + * Test that card opening does not take too long + * Do not wait for master on wayland session + * Test that monitor power off event is sent on vt terminal swithc when user is connected + * Test that no monitor power off events are sent when user driver is not connected + * Test that evdi_painter listens to VT notifications + * Blank evdi display on switch to tty console. Fixes GH-474. + * Add evdi_test_data base test context stucture and drm_device removal hook + * Make evdi_painter_dpms_notify to take evdi_painter as argument instead of evdi_device +- With this update fix-v1.14.5-build.patch is not needed anymore. + +------------------------------------------------------------------- Old: ---- evdi-1.14.5.obscpio fix-v1.14.5-build.patch New: ---- evdi-1.14.7.obscpio BETA DEBUG BEGIN: Old: * Make evdi_painter_dpms_notify to take evdi_painter as argument instead of evdi_device - With this update fix-v1.14.5-build.patch is not needed anymore. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evdi.spec ++++++ --- /var/tmp/diff_new_pack.3UjMHO/_old 2024-10-04 17:11:39.367624112 +0200 +++ /var/tmp/diff_new_pack.3UjMHO/_new 2024-10-04 17:11:39.371624278 +0200 @@ -21,7 +21,7 @@ Name: evdi Release: 0 -Version: 1.14.5 +Version: 1.14.7 Summary: Extensible Virtual Display Interface (EVDI) is a Linux Kernel Module License: GPL-2.0-only AND LGPL-2.1-only Group: System/Kernel @@ -30,7 +30,6 @@ Source1: evdi-kmp-preamble Source2: evdi-rpmlintrc Patch0: evdi-Enable-compilation-against-15.5.patch -Patch1: fix-v1.14.5-build.patch BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: pkgconfig BuildRequires: pkgconfig(libdrm) @@ -74,7 +73,6 @@ %if 0%{?sle_version} == 150500 %patch -P 0 -p1 %endif -%patch -P 1 -p1 %build pushd library ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3UjMHO/_old 2024-10-04 17:11:39.399625448 +0200 +++ /var/tmp/diff_new_pack.3UjMHO/_new 2024-10-04 17:11:39.403625616 +0200 @@ -3,7 +3,7 @@ <service name="obs_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/DisplayLink/evdi.git</param> - <param name="revision">v1.14.5</param> + <param name="revision">v1.14.7</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> ++++++ evdi-1.14.5.obscpio -> evdi-1.14.7.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/.gitlab/CODEOWNERS new/evdi-1.14.7/.gitlab/CODEOWNERS --- old/evdi-1.14.5/.gitlab/CODEOWNERS 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/.gitlab/CODEOWNERS 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,2 @@ +[MAINTAINER] +* @lspintzyk @jprussak @emajewska @mlukaszek @akaleta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/README.md new/evdi-1.14.7/README.md --- old/evdi-1.14.5/README.md 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/README.md 2024-09-20 11:14:26.000000000 +0200 @@ -24,6 +24,10 @@ - The communication between the EVDI kernel module and the wrapper libevdi library is not access-controlled or authenticated. This could be improved in future releases, making it harder to compromise the data EVDI is sending and receiving. - EVDI kernel module driver is currently a platform_driver, for multiple reasons; most importantly because virtual displays are not discoverable, i.e. cannot be enumerated at the hardware level. EVDI is also a generic device, not tied to any particular kind of device, transport layer or a bus. +## Packages for other distributions + +There is an unoffical github project at [DisplayLink RPM](https://github.com/displaylink-rpm/displaylink-rpm) which is generating RPM package for Fedora, CentOS Stream, Rocky Linux and AlmaLinux OS. It is not in our control but it uses our code as the basis to create the RPM packages. + ## Licensing Elements of this project are licensed under various licenses. In particular, the `module` and `library` are licensed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/ci/deb_config new/evdi-1.14.7/ci/deb_config --- old/evdi-1.14.5/ci/deb_config 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/ci/deb_config 2024-09-20 11:14:26.000000000 +0200 @@ -8,7 +8,7 @@ evdi_maintainer='Synaptics Technical Support <technical-enquiries(a)synaptics.com>' # shellcheck disable=SC2034 -evdi_version='1.14.5' +evdi_version='1.14.7' # shellcheck disable=SC2034 evdi_description="Extensible Virtual Display Interface (EVDI) is a Linux® kernel module that enables management of multiple screens. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/ci/run_style_check new/evdi-1.14.7/ci/run_style_check --- old/evdi-1.14.5/ci/run_style_check 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/ci/run_style_check 2024-09-20 11:14:26.000000000 +0200 @@ -24,7 +24,7 @@ ./checkpatch.pl --terse --no-tree --ignore NEW_TYPEDEFS -f ./library/* result=$((result || $?)) -find ./module -type f -exec ./checkpatch.pl --terse --no-tree --ignore LINUX_VERSION_CODE,PREFER_PR_LEVEL -f {} + +find ./module -type f -exec ./checkpatch.pl --terse --no-tree --ignore LINUX_VERSION_CODE,PREFER_PR_LEVEL -f {} \; result=$((result || $?)) rm "${files[@]}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/library/Makefile new/evdi-1.14.7/library/Makefile --- old/evdi-1.14.5/library/Makefile 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/library/Makefile 2024-09-20 11:14:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 - 2020 DisplayLink (UK) Ltd. +# Copyright (c) 2015 - 2024 DisplayLink (UK) Ltd. # INSTALL ?= install @@ -11,7 +11,7 @@ DEPS = evdi_ioctl.h CFLAGS := -I../module -std=gnu99 -fPIC -D_FILE_OFFSET_BITS=64 $(CFLAGS) $$($(PKG_CONFIG) --cflags-only-I libdrm) -LIBVER := 1.14.5 +LIBVER := 1.14.7 LIBABI := 1 PREFIX ?= /usr/local @@ -25,7 +25,7 @@ %.o: %.c $(DEPS) $(CC) $(CFLAGS) -o $@ -c $< -libevdi.so.$(LIBVER): evdi_lib.o +libevdi.so.$(LIBVER): evdi_lib.o evdi_procfs.o $(CC) $^ -shared -Wl,-soname,libevdi.so.$(LIBABI) -o $@ -lc -lgcc $(LDFLAGS) $(CP) libevdi.so.$(LIBVER) libevdi.so $(LN) -sf libevdi.so.$(LIBVER) libevdi.so.$(LIBABI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/library/evdi_lib.c new/evdi-1.14.7/library/evdi_lib.c --- old/evdi-1.14.5/library/evdi_lib.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/library/evdi_lib.c 2024-09-20 11:14:26.000000000 +0200 @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-2.1-only -// Copyright (c) 2015 - 2020 DisplayLink (UK) Ltd. +// Copyright (c) 2015 - 2024 DisplayLink (UK) Ltd. #include <stddef.h> #include <stdint.h> @@ -131,11 +131,9 @@ static void addFrameBuffer(evdi_handle context, struct evdi_buffer const *frame_buffer) { - struct evdi_frame_buffer_node **node = NULL; - - for (node = &context->frameBuffersListHead; + for (struct evdi_frame_buffer_node **node = &context->frameBuffersListHead; ; - node = (struct evdi_frame_buffer_node **)&(*node)->next) { + node = &(*node)->next) { if (*node) continue; @@ -150,15 +148,12 @@ * @brief Removes all frame buffers matching the given id * @param id of frame buffer to remove, NULL matches every buffer, thus all * will be removed - * @return number of buffers removed - * @todo Return value doesn't seem to be used anywhere */ -static int removeFrameBuffer(evdi_handle context, int const *id) +static void removeFrameBuffer(evdi_handle context, int const *id) { struct evdi_frame_buffer_node *current = NULL; struct evdi_frame_buffer_node *next = NULL; struct evdi_frame_buffer_node **prev = NULL; - int removedCount = 0; current = context->frameBuffersListHead; prev = &context->frameBuffersListHead; @@ -167,7 +162,6 @@ if (!id || current->frame_buffer.id == *id) { free(current); - ++removedCount; *prev = next; } else { prev = &current->next; @@ -175,8 +169,6 @@ current = next; } - - return removedCount; } static int is_evdi_compatible(int fd) @@ -210,7 +202,9 @@ static int is_evdi(int fd) { - char name[64] = { 0 }, date[64] = { 0 }, desc[64] = { 0 }; + char name[64] = { 0 }; + char date[64] = { 0 }; + char desc[64] = { 0 }; struct drm_version ver = { .name_len = sizeof(name), .name = name, @@ -311,7 +305,7 @@ { pid_t myself = getpid(); DIR *proc_dir; - struct dirent *proc_entry; + const struct dirent *proc_entry; int result = 0; proc_dir = opendir("/proc"); @@ -319,7 +313,7 @@ return 0; while ((proc_entry = readdir(proc_dir)) != NULL) { - char *d_name = proc_entry->d_name; + const char *d_name = proc_entry->d_name; if (d_name[0] < '0' || d_name[0] > '9' @@ -415,9 +409,8 @@ snprintf(dev, PATH_MAX, "/dev/dri/card%d", device); -#ifndef CHROMEOS - wait_for_master(dev); -#endif + if (Xorg_running()) + wait_for_master(dev); fd = wait_for_device(dev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/library/evdi_lib.h new/evdi-1.14.7/library/evdi_lib.h --- old/evdi-1.14.5/library/evdi_lib.h 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/library/evdi_lib.h 2024-09-20 11:14:26.000000000 +0200 @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-only - * Copyright (c) 2015 - 2020 DisplayLink (UK) Ltd. + * Copyright (c) 2015 - 2024 DisplayLink (UK) Ltd. */ #ifndef EVDI_LIB_H @@ -15,7 +15,7 @@ #define LIBEVDI_VERSION_MAJOR 1 #define LIBEVDI_VERSION_MINOR 14 -#define LIBEVDI_VERSION_PATCH 5 +#define LIBEVDI_VERSION_PATCH 7 struct evdi_lib_version { int version_major; @@ -134,6 +134,8 @@ void evdi_get_lib_version(struct evdi_lib_version *version); void evdi_set_logging(struct evdi_logging evdi_logging); +bool Xorg_running(void); + #ifdef __cplusplus } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/library/evdi_procfs.c new/evdi-1.14.7/library/evdi_procfs.c --- old/evdi-1.14.5/library/evdi_procfs.c 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/library/evdi_procfs.c 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: LGPL-2.1-only +// Copyright (c) 2015 - 2024 DisplayLink (UK) Ltd. + +#include "evdi_lib.h" +#include <assert.h> +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <poll.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> + +const int command_length = 50; +const int name_length = 30; + +static FILE *open_process_folder(const char *pid) +{ + FILE *pf; + char command[command_length]; + + snprintf(command, command_length, "/proc/%s/stat", pid); + pf = fopen(command, "r"); + + return pf; +} + +static void close_folder(FILE *pf) +{ + if (fclose(pf) != 0) + exit(EXIT_FAILURE); +} + +static char *process_name(FILE *pf) +{ + int Xorg_name_len = 6; + char *name = (char *)malloc(Xorg_name_len * sizeof(char)); + + fscanf(pf, "%*s"); + fscanf(pf, "%6s", name); // Xorg process had name (Xorg) + + return name; +} + +static bool is_name_Xorg(const char *name) +{ + return strstr(name, "Xorg") != NULL; +} + +static bool is_Xorg(const char *pid) +{ + FILE *pf; + bool result; + char *name; + + pf = open_process_folder(pid); + if (pf == NULL) + return false; + name = process_name(pf); + result = is_name_Xorg(name); + + close_folder(pf); + free(name); + + return result; +} + +static bool is_numeric(const char *str) +{ + return str[0] >= '0' && str[0] <= '9'; +} + +static bool is_Xorg_process_folder(const struct dirent *proc_entry) +{ + const char *folder_name = proc_entry->d_name; + + if (is_numeric(folder_name) && is_Xorg(folder_name)) + return true; + + return false; +} + +static bool iterate_through_all_process_folders_and_find_Xorg(void) +{ + DIR *proc_dir; + const struct dirent *proc_entry; + bool result = false; + + proc_dir = opendir("/proc"); + if (proc_dir == NULL) + return false; + + + while ((proc_entry = readdir(proc_dir)) != NULL) { + if (is_Xorg_process_folder(proc_entry)) { + result = true; + break; + } + } + + closedir(proc_dir); + return result; +} + +bool Xorg_running(void) +{ + return iterate_through_all_process_folders_and_find_Xorg(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/Makefile new/evdi-1.14.7/module/Makefile --- old/evdi-1.14.5/module/Makefile 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/Makefile 2024-09-20 11:14:26.000000000 +0200 @@ -52,6 +52,7 @@ ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o evdi-$(CONFIG_COMPAT) += evdi_ioc32.o +CONFIG_DRM_EVDI ?= m obj-$(CONFIG_DRM_EVDI) := evdi.o obj-y += tests/ @@ -62,7 +63,7 @@ DKMS ?= dkms RM ?= rm -MODVER=1.14.5 +MODVER=1.14.7 ifeq ($(KVER),) KVER := $(shell uname -r) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/dkms.conf new/evdi-1.14.7/module/dkms.conf --- old/evdi-1.14.5/module/dkms.conf 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/dkms.conf 2024-09-20 11:14:26.000000000 +0200 @@ -7,7 +7,7 @@ # PACKAGE_NAME="evdi" -PACKAGE_VERSION=1.14.5 +PACKAGE_VERSION=1.14.7 AUTOINSTALL=yes MAKE[0]="make all INCLUDEDIR=/lib/modules/$kernelver/build/include KVERSION=$kernelver DKMS_BUILD=1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/dkms_install.sh new/evdi-1.14.7/module/dkms_install.sh --- old/evdi-1.14.5/module/dkms_install.sh 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/dkms_install.sh 2024-09-20 11:14:26.000000000 +0200 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (c) 2023 DisplayLink (UK) Ltd. -evdi_version='1.14.5' +evdi_version='1.14.7' EVDI_DIR=$(dirname "${BASH_SOURCE[0]}") EVDI_REBOOT_RATIONALE= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_drm_drv.c new/evdi-1.14.7/module/evdi_drm_drv.c --- old/evdi-1.14.5/module/evdi_drm_drv.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_drm_drv.c 2024-09-20 11:14:26.000000000 +0200 @@ -159,6 +159,8 @@ kfree(evdi); dev->dev_private = NULL; EVDI_INFO("Evdi drm_device removed.\n"); + + EVDI_TEST_HOOK(evdi_testhook_drm_device_destroyed()); } static int evdi_drm_device_init(struct drm_device *dev) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_drm_drv.h new/evdi-1.14.7/module/evdi_drm_drv.h --- old/evdi-1.14.5/module/evdi_drm_drv.h 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_drm_drv.h 2024-09-20 11:14:26.000000000 +0200 @@ -38,7 +38,7 @@ #include <drm/drm_framebuffer.h> #include "evdi_debug.h" - +#include "tests/evdi_test.h" struct evdi_fbdev; struct evdi_painter; @@ -145,7 +145,7 @@ struct drm_crtc *crtc, struct drm_pending_vblank_event *vblank); void evdi_painter_send_update_ready_if_needed(struct evdi_painter *painter); -void evdi_painter_dpms_notify(struct evdi_device *evdi, int mode); +void evdi_painter_dpms_notify(struct evdi_painter *painter, int mode); void evdi_painter_mode_changed_notify(struct evdi_device *evdi, struct drm_display_mode *mode); unsigned int evdi_painter_poll(struct file *filp, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_fb.c new/evdi-1.14.7/module/evdi_fb.c --- old/evdi-1.14.5/module/evdi_fb.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_fb.c 2024-09-20 11:14:26.000000000 +0200 @@ -404,7 +404,7 @@ fb = &efbdev->efb.base; efbdev->helper.fb = fb; -#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) +#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) efbdev->helper.info = info; #else efbdev->helper.fbdev = info; @@ -464,7 +464,7 @@ { struct fb_info *info; -#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) +#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) if (efbdev->helper.info) { info = efbdev->helper.info; #else @@ -556,7 +556,7 @@ return; efbdev = evdi->fbdev; -#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) +#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) if (efbdev->helper.info) { struct fb_info *info; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_modeset.c new/evdi-1.14.7/module/evdi_modeset.c --- old/evdi-1.14.5/module/evdi_modeset.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_modeset.c 2024-09-20 11:14:26.000000000 +0200 @@ -86,7 +86,7 @@ evdi_painter_mode_changed_notify(evdi, &crtc_state->adjusted_mode); if (notify_dpms) - evdi_painter_dpms_notify(evdi, + evdi_painter_dpms_notify(evdi->painter, crtc_state->active ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF); evdi_painter_set_vblank(evdi->painter, crtc, crtc_state->event); @@ -258,9 +258,9 @@ crtc = state->crtc; if (!old_state->crtc && state->crtc) - evdi_painter_dpms_notify(evdi, DRM_MODE_DPMS_ON); + evdi_painter_dpms_notify(evdi->painter, DRM_MODE_DPMS_ON); else if (old_state->crtc && !state->crtc) - evdi_painter_dpms_notify(evdi, DRM_MODE_DPMS_OFF); + evdi_painter_dpms_notify(evdi->painter, DRM_MODE_DPMS_OFF); if (state->fb) { struct drm_framebuffer *fb = state->fb; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_painter.c new/evdi-1.14.7/module/evdi_painter.c --- old/evdi-1.14.5/module/evdi_painter.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_painter.c 2024-09-20 11:14:26.000000000 +0200 @@ -30,6 +30,10 @@ #include <linux/completion.h> #include <linux/dma-buf.h> +#include <linux/vt_kern.h> +#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE +#include <linux/compiler_attributes.h> +#endif #if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || defined(EL9) MODULE_IMPORT_NS(DMA_BUF); @@ -104,6 +108,8 @@ struct completion ddcci_response_received; char *ddcci_buffer; unsigned int ddcci_buffer_length; + struct notifier_block vt_notifier; + int fg_console; }; static void expand_rect(struct drm_clip_rect *a, const struct drm_clip_rect *b) @@ -500,6 +506,7 @@ { struct drm_pending_event *event = create_dpms_event(mode); + EVDI_TEST_HOOK(evdi_testhook_painter_send_dpms(mode)); evdi_painter_send_event(painter, event); } @@ -696,13 +703,12 @@ static const char * const dpms_str[] = { "on", "standby", "suspend", "off" }; -void evdi_painter_dpms_notify(struct evdi_device *evdi, int mode) +void evdi_painter_dpms_notify(struct evdi_painter *painter, int mode) { - struct evdi_painter *painter = evdi->painter; const char *mode_str; if (!painter) { - EVDI_WARN("(card%d) Painter does not exist!", evdi->dev_index); + EVDI_WARN("Painter does not exist!"); return; } @@ -711,6 +717,11 @@ switch (mode) { case DRM_MODE_DPMS_ON: + painter->fg_console = fg_console; +#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE + fallthrough; +#else +#endif case DRM_MODE_DPMS_STANDBY: case DRM_MODE_DPMS_SUSPEND: case DRM_MODE_DPMS_OFF: @@ -719,8 +730,8 @@ default: mode_str = "unknown"; }; - EVDI_INFO("(card%d) Notifying display power state: %s", - evdi->dev_index, mode_str); + EVDI_INFO("(card%d) Notifying display power state: %s\n", + painter->drm_device->primary->index, mode_str); evdi_painter_send_dpms(painter, mode); } @@ -1177,6 +1188,38 @@ schedule_delayed_work(&painter->send_events_work, msecs_to_jiffies(5)); } +#define vt_notifier_block_to_evdi_painter(x) container_of(x, struct evdi_painter, vt_notifier) +static int evdi_painter_vt_notifier_call(struct notifier_block *blk, + __always_unused unsigned long code, __always_unused void *_param) +{ + struct evdi_painter *painter = vt_notifier_block_to_evdi_painter(blk); + + if (painter->is_connected && fg_console != painter->fg_console && !painter->needs_full_modeset) { + EVDI_INFO("(card%d) VT switch detected\n", painter->drm_device->primary->index); + evdi_painter_dpms_notify(painter, DRM_MODE_DPMS_OFF); + evdi_painter_force_full_modeset(painter); + } + + return NOTIFY_OK; +} + + +static void evdi_painter_register_to_vt(struct evdi_painter *painter) +{ + painter->vt_notifier.notifier_call = evdi_painter_vt_notifier_call; + register_vt_notifier(&painter->vt_notifier); + + EVDI_TEST_HOOK(evdi_testhook_painter_vt_register(&painter->vt_notifier)); +} + +static void evdi_painter_unregister_from_vt(struct evdi_painter *painter) +{ + unregister_vt_notifier(&painter->vt_notifier); + painter->vt_notifier.notifier_call = NULL; + + EVDI_TEST_HOOK(evdi_testhook_painter_vt_register(&painter->vt_notifier)); +} + int evdi_painter_init(struct evdi_device *dev) { EVDI_CHECKPT(); @@ -1189,6 +1232,8 @@ dev->painter->crtc = NULL; dev->painter->vblank = NULL; dev->painter->drm_device = dev->ddev; + evdi_painter_register_to_vt(dev->painter); + INIT_LIST_HEAD(&dev->painter->pending_events); INIT_DELAYED_WORK(&dev->painter->send_events_work, evdi_send_events_work); @@ -1207,6 +1252,7 @@ } painter_lock(painter); + evdi_painter_unregister_from_vt(painter); kfree(painter->edid); painter->edid_length = 0; painter->edid = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_platform_dev.c new/evdi-1.14.7/module/evdi_platform_dev.c --- old/evdi-1.14.5/module/evdi_platform_dev.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_platform_dev.c 2024-09-20 11:14:26.000000000 +0200 @@ -85,7 +85,11 @@ return PTR_ERR_OR_ZERO(dev); } +#if KERNEL_VERSION(6, 11, 0) <= LINUX_VERSION_CODE +void evdi_platform_device_remove(struct platform_device *pdev) +#else int evdi_platform_device_remove(struct platform_device *pdev) +#endif { struct evdi_platform_device_data *data = platform_get_drvdata(pdev); @@ -93,7 +97,10 @@ evdi_drm_device_remove(data->drm_dev); kfree(data); +#if KERNEL_VERSION(6, 11, 0) <= LINUX_VERSION_CODE +#else return 0; +#endif } bool evdi_platform_device_is_free(struct platform_device *pdev) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_platform_dev.h new/evdi-1.14.7/module/evdi_platform_dev.h --- old/evdi-1.14.5/module/evdi_platform_dev.h 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_platform_dev.h 2024-09-20 11:14:26.000000000 +0200 @@ -21,6 +21,7 @@ #define _EVDI_PLATFORM_DEV_H_ #include <linux/types.h> +#include <linux/version.h> struct platform_device_info; struct platform_device; @@ -31,7 +32,11 @@ void evdi_platform_dev_destroy(struct platform_device *dev); int evdi_platform_device_probe(struct platform_device *pdev); +#if KERNEL_VERSION(6, 11, 0) <= LINUX_VERSION_CODE +void evdi_platform_device_remove(struct platform_device *pdev); +#else int evdi_platform_device_remove(struct platform_device *pdev); +#endif bool evdi_platform_device_is_free(struct platform_device *pdev); void evdi_platform_device_link(struct platform_device *pdev, struct device *parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/evdi_platform_drv.h new/evdi-1.14.7/module/evdi_platform_drv.h --- old/evdi-1.14.5/module/evdi_platform_drv.h 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/evdi_platform_drv.h 2024-09-20 11:14:26.000000000 +0200 @@ -25,11 +25,11 @@ #define DRIVER_NAME "evdi" #define DRIVER_DESC "Extensible Virtual Display Interface" -#define DRIVER_DATE "20240626" +#define DRIVER_DATE "20240920" #define DRIVER_MAJOR 1 #define DRIVER_MINOR 14 -#define DRIVER_PATCH 5 +#define DRIVER_PATCH 7 void evdi_platform_remove_all_devices(struct device *device); unsigned int evdi_platform_device_count(struct device *device); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/Makefile new/evdi-1.14.7/module/tests/Makefile --- old/evdi-1.14.5/module/tests/Makefile 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/tests/Makefile 2024-09-20 11:14:26.000000000 +0200 @@ -1,4 +1,5 @@ ccflags-$(CONFIG_DRM_EVDI_KUNIT_TEST) += -I$(srctree)/drivers/gpu/drm/evdi -obj-$(CONFIG_DRM_EVDI_KUNIT_TEST) += evdi_test.o + +obj-$(CONFIG_DRM_EVDI_KUNIT_TEST) += evdi_test.o test_evdi_vt_switch.o evdi_fake_user_client.o evdi_fake_compositor.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_fake_compositor.c new/evdi-1.14.7/module/tests/evdi_fake_compositor.c --- old/evdi-1.14.5/module/tests/evdi_fake_compositor.c 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/evdi_fake_compositor.c 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + + +#include <kunit/test.h> +#include <kunit/test-bug.h> +#include <kunit/device.h> + +#include <linux/file.h> +#include <linux/vt_kern.h> + +#include <drm/drm_fourcc.h> + +#include "evdi_drm_drv.h" +#include "evdi_drm.h" +#include "tests/evdi_test.h" +#include "tests/evdi_fake_compositor.h" + + +void evdi_fake_compositor_create(struct kunit *test) +{ + struct kunit_resource *resource; + struct evdi_fake_compositor_data *compositor_data; + + resource = kunit_find_named_resource(test, "fake_wayland"); + if (resource) { + KUNIT_FAIL(test, "fake_wayland data already exists"); + return; + } + + resource = kunit_kzalloc(test, sizeof(struct kunit_resource), GFP_KERNEL); + compositor_data = kunit_kzalloc(test, sizeof(struct evdi_fake_compositor_data), GFP_KERNEL); + kunit_add_named_resource(test, NULL, NULL, resource, "fake_wayland", compositor_data); + + static const struct drm_display_mode default_mode = { + DRM_SIMPLE_MODE(640, 480, 64, 48) + }; + struct evdi_framebuffer efb = { + .base = { + .format = drm_format_info(DRM_FORMAT_XRGB8888), + .pitches = { 4*640, 0, 0 }, + }, + .obj = NULL, + .active = true + }; + + compositor_data->efb = kunit_kzalloc(test, sizeof(struct evdi_framebuffer), GFP_KERNEL); + memcpy(compositor_data->efb, &efb, sizeof(struct evdi_framebuffer)); + memcpy(&compositor_data->mode, &default_mode, sizeof(default_mode)); +} + +void evdi_fake_compositor_connect(struct kunit *test, struct drm_device *device) +{ + struct kunit_resource *resource = kunit_find_named_resource(test, "fake_wayland"); + struct evdi_fake_compositor_data *compositor_data = resource->data; + struct evdi_device *evdi = (struct evdi_device *)device->dev_private; + + evdi_painter_set_scanout_buffer(evdi->painter, compositor_data->efb); + evdi_painter_mode_changed_notify(evdi, &compositor_data->mode); + evdi_painter_dpms_notify(evdi->painter, DRM_MODE_DPMS_ON); +} + +void evdi_fake_compositor_disconnect(__maybe_unused struct kunit *test, __maybe_unused struct drm_device *device) +{ +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_fake_compositor.h new/evdi-1.14.7/module/tests/evdi_fake_compositor.h --- old/evdi-1.14.5/module/tests/evdi_fake_compositor.h 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/evdi_fake_compositor.h 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef EVDI_FAKE_COMPOSITOR_H +#define EVDI_FAKE_COMPOSITOR_H + +#ifdef CONFIG_DRM_EVDI_KUNIT_TEST + + +#include <kunit/test.h> +#include <kunit/test-bug.h> +#include <kunit/device.h> + + + +/* kunit tests helpers faking userspace compositor leveraging evdi to add virtual display. + * e.g. Xorg, gnome-wayland, kwin + */ +struct evdi_fake_compositor_data { + struct evdi_framebuffer *efb; + struct drm_display_mode mode; +}; + +void evdi_fake_compositor_create(struct kunit *test); +void evdi_fake_compositor_connect(struct kunit *test, struct drm_device *device); +void evdi_fake_compositor_disconnect(struct kunit *test, struct drm_device *device); + + +#endif // CONFIG_DRM_EVDI_KUNIT_TEST +#endif // EVDI_FAKE_COMPOSITOR_H + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_fake_user_client.c new/evdi-1.14.7/module/tests/evdi_fake_user_client.c --- old/evdi-1.14.5/module/tests/evdi_fake_user_client.c 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/evdi_fake_user_client.c 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + + +#include <kunit/test.h> +#include <kunit/test-bug.h> +#include <kunit/device.h> + +#include <linux/file.h> +#include <linux/vt_kern.h> + +#include <drm/drm_file.h> + +#include "evdi_drm_drv.h" +#include "evdi_drm.h" +#include "tests/evdi_test.h" +#include "tests/evdi_fake_user_client.h" + +/* copied from drm/tests/drm_kunit_edid.h */ +static const unsigned char test_edid_dvi_1080p[] = { + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x31, 0xd8, 0x2a, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x01, 0x03, 0x81, 0xa0, 0x5a, 0x78, + 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x3a, 0x80, 0x18, 0x71, 0x38, + 0x2d, 0x40, 0x58, 0x2c, 0x45, 0x00, 0x40, 0x84, 0x63, 0x00, 0x00, 0x1e, + 0x00, 0x00, 0x00, 0xfc, 0x00, 0x54, 0x65, 0x73, 0x74, 0x20, 0x45, 0x44, + 0x49, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x32, + 0x46, 0x1e, 0x46, 0x0f, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xab +}; + +void evdi_fake_user_client_create(struct kunit *test) +{ + struct kunit_resource *resource; + struct evdi_fake_user_data *user_data; + + resource = kunit_find_named_resource(test, "fake_evdi_user"); + if (resource) { + KUNIT_FAIL(test, "fake_evdi_user data already exists"); + return; + } + + resource = kunit_kzalloc(test, sizeof(struct kunit_resource), GFP_KERNEL); + user_data = kunit_kzalloc(test, sizeof(struct evdi_fake_user_data), GFP_KERNEL); + kunit_add_named_resource(test, NULL, NULL, resource, "fake_evdi_user", user_data); +} + +void evdi_fake_user_client_connect(struct kunit *test, struct drm_device *device) +{ + struct kunit_resource *resource = kunit_find_named_resource(test, "fake_evdi_user"); + struct evdi_fake_user_data *user_data = resource->data; + + void __user *user_edid = evdi_kunit_alloc_usermem(test, sizeof(test_edid_dvi_1080p)); + struct drm_evdi_connect connect_data = { + .connected = true, + .dev_index = device->primary->index, + .edid = user_edid, + .edid_length = sizeof(test_edid_dvi_1080p), + .pixel_area_limit = 1920 * 1080, + .pixel_per_second_limit = 1920 * 1080 * 60, + }; + + if (copy_to_user((unsigned char * __user)connect_data.edid, test_edid_dvi_1080p, sizeof(test_edid_dvi_1080p))) + KUNIT_FAIL(test, "Failed to copy edid to userspace memory"); + user_data->file = mock_drm_getfile(device->primary, O_RDWR); + + evdi_painter_connect_ioctl(device, &connect_data, user_data->file->private_data); +} + +void evdi_fake_user_client_disconnect(struct kunit *test, struct drm_device *device) +{ + struct kunit_resource *resource = kunit_find_named_resource(test, "fake_evdi_user"); + struct evdi_fake_user_data *user_data = resource->data; + + if (user_data->file) { + fput(user_data->file); + user_data->file = NULL; + flush_delayed_fput(); + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_fake_user_client.h new/evdi-1.14.7/module/tests/evdi_fake_user_client.h --- old/evdi-1.14.5/module/tests/evdi_fake_user_client.h 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/evdi_fake_user_client.h 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef EVDI_FAKE_USER_CLIENT_H +#define EVDI_FAKE_USER_CLIENT_H + +#ifdef CONFIG_DRM_EVDI_KUNIT_TEST + + +#include <kunit/test.h> +#include <kunit/test-bug.h> +#include <kunit/device.h> + +#include <linux/file.h> +#include <linux/compiler_types.h> +#include <drm/drm_device.h> + +/* kunit tests helpers faking evdi userspace client, usually displaylink-driver daemon. */ + +struct evdi_fake_user_data { + struct file *file; +}; +void __user *evdi_kunit_alloc_usermem(struct kunit *test, unsigned int size); + +void evdi_fake_user_client_create(struct kunit *test); +void evdi_fake_user_client_connect(struct kunit *test, struct drm_device *device); +void evdi_fake_user_client_disconnect(struct kunit *test, struct drm_device *device); + +#endif // CONFIG_DRM_EVDI_KUNIT_TEST +#endif // EVDI_FAKE_USER_CLIENT_H + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_test.c new/evdi-1.14.7/module/tests/evdi_test.c --- old/evdi-1.14.5/module/tests/evdi_test.c 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/module/tests/evdi_test.c 2024-09-20 11:14:26.000000000 +0200 @@ -7,21 +7,103 @@ * more details. */ - +#include <linux/jiffies.h> #include <kunit/test.h> +#include <kunit/test-bug.h> #include <kunit/device.h> +#include <linux/mman.h> +#include <linux/module.h> +#include <linux/sched.h> +#include <linux/slab.h> +#include <linux/uaccess.h> +#include <linux/jiffies.h> #include "evdi_drm_drv.h" +void __user *evdi_kunit_alloc_usermem(struct kunit *test, unsigned int size) +{ + void *kmem = kunit_kzalloc(test, size, GFP_KERNEL); + unsigned long user_addr; + + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, kmem); + + user_addr = kunit_vm_mmap(test, NULL, 0, size, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANONYMOUS | MAP_PRIVATE, 0); + KUNIT_ASSERT_NE_MSG(test, user_addr, 0, + "Could not create userspace mm"); + KUNIT_ASSERT_LT_MSG(test, user_addr, (unsigned long)TASK_SIZE, + "Failed to allocate user memory"); + + return (void __user *)user_addr; +} + +void evdi_testhook_painter_vt_register(struct notifier_block *vt_notifier) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_test_data *base = (struct evdi_test_data *)test->priv; + + if (base && base->hooks.painter_vt_register) + base->hooks.painter_vt_register(vt_notifier); +} + +void evdi_testhook_painter_send_dpms(int mode) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_test_data *base = (struct evdi_test_data *)test->priv; + + if (base && base->hooks.painter_send_dpms) + base->hooks.painter_send_dpms(mode); +} + +void evdi_testhook_drm_device_destroyed(void) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_test_data *base = (struct evdi_test_data *)test->priv; + + if (base && base->hooks.drm_device_destroyed) + base->hooks.drm_device_destroyed(); +} + +static void testhook_drm_device_destroyed(void) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_test_data *base = (struct evdi_test_data *)test->priv; + + complete(base->dev_destroyed); +} + +void evdi_test_data_init(struct kunit *test, struct evdi_test_data *data) +{ + data->parent = kunit_device_register(test, "/dev/card1"); + data->dev_destroyed = kunit_kzalloc(test, sizeof(struct completion), GFP_KERNEL); + init_completion(data->dev_destroyed); + + data->hooks.drm_device_destroyed = testhook_drm_device_destroyed; + test->priv = (void *)data; +} + +void evdi_test_data_exit(struct kunit *test, struct evdi_test_data *data) +{ + if (!wait_for_completion_timeout(data->dev_destroyed, msecs_to_jiffies(1000))) + KUNIT_FAIL(test, "Failed to wait for drm_device removal\n"); + + kunit_device_unregister(test, data->parent); +} + static void test_evdi_create_drm_device(struct kunit *test) { - struct device *parent = kunit_device_register(test, "/dev/card1"); - struct drm_device *dev = evdi_drm_device_create(parent); + struct evdi_test_data *data = kunit_kzalloc(test, sizeof(struct evdi_test_data), GFP_KERNEL); + struct drm_device *dev; + + evdi_test_data_init(test, data); + + dev = evdi_drm_device_create(data->parent); KUNIT_EXPECT_NOT_NULL(test, dev); evdi_drm_device_remove(dev); - - kunit_device_unregister(test, parent); + evdi_test_data_exit(test, data); + kunit_kfree(test, test->priv); } static struct kunit_case evdi_test_cases[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/evdi_test.h new/evdi-1.14.7/module/tests/evdi_test.h --- old/evdi-1.14.5/module/tests/evdi_test.h 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/evdi_test.h 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + + +#ifndef EVDI_TEST_H +#define EVDI_TEST_H + +#ifdef CONFIG_DRM_EVDI_KUNIT_TEST +#define EVDI_TEST_HOOK(foo) foo +#else +#include <linux/printk.h> +#define EVDI_TEST_HOOK(foo) no_printk(__stringify(foo)) +#endif + +#ifdef CONFIG_DRM_EVDI_KUNIT_TEST + +#include <linux/completion.h> + +/* evdi hooks for kunit tests */ +void evdi_testhook_painter_vt_register(struct notifier_block *vt_notifier); +void evdi_testhook_painter_send_dpms(int mode); +void evdi_testhook_drm_device_destroyed(void); + +struct evdi_test_hooks { + void (*painter_vt_register)(struct notifier_block *vt_notifier); + void (*painter_send_dpms)(int mode); + void (*drm_device_destroyed)(void); +}; + +/* evdi kunit base type for test private data */ +struct evdi_test_data { + struct device *parent; + struct drm_device *dev; + struct completion *dev_destroyed; + struct evdi_test_hooks hooks; +}; + +void evdi_test_data_init(struct kunit *test, struct evdi_test_data *data); +void evdi_test_data_exit(struct kunit *test, struct evdi_test_data *data); + +/* evdi test utils */ +void __user *evdi_kunit_alloc_usermem(struct kunit *test, unsigned int size); + +#endif // CONFIG_DRM_EVDI_KUNIT_TEST +#endif // EVDI_TEST_H + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/module/tests/test_evdi_vt_switch.c new/evdi-1.14.7/module/tests/test_evdi_vt_switch.c --- old/evdi-1.14.5/module/tests/test_evdi_vt_switch.c 1970-01-01 01:00:00.000000000 +0100 +++ new/evdi-1.14.7/module/tests/test_evdi_vt_switch.c 2024-09-20 11:14:26.000000000 +0200 @@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024 DisplayLink (UK) Ltd. + * + * This file is subject to the terms and conditions of the GNU General Public + * License v2. See the file COPYING in the main directory of this archive for + * more details. + */ + + +#include <kunit/test.h> +#include <kunit/test-bug.h> +#include <kunit/device.h> +#include <linux/vt_kern.h> +#include "evdi_drm_drv.h" +#include "tests/evdi_test.h" +#include "tests/evdi_fake_user_client.h" +#include "tests/evdi_fake_compositor.h" + + +struct evdi_vt_test { + struct evdi_test_data base; + struct notifier_block *vt_notifier; + int dpms_mode; +}; +#define to_evdi_vt_test(x) container_of(x, struct evdi_vt_test, base) + +static void testhook_painter_vt_register(struct notifier_block *vt_notifier) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + data->vt_notifier = vt_notifier; +} + +static void testhook_painter_send_dpms(int mode) +{ + struct kunit *test = kunit_get_current_test(); + struct evdi_test_data *base = (struct evdi_test_data *)test->priv; + struct evdi_vt_test *data = to_evdi_vt_test(base); + + data->dpms_mode = mode; +} + +static int suite_test_vt_init(struct kunit *test) +{ + struct evdi_vt_test *data = kunit_kzalloc(test, sizeof(struct evdi_vt_test), GFP_KERNEL); + + evdi_test_data_init(test, &data->base); + data->base.hooks.painter_vt_register = testhook_painter_vt_register; + data->base.hooks.painter_send_dpms = testhook_painter_send_dpms; + data->base.dev = evdi_drm_device_create(data->base.parent); + + return 0; +} + +static void suite_test_vt_exit(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + if (data->base.dev) { + evdi_drm_device_remove(data->base.dev); + data->base.dev = NULL; + } + + evdi_test_data_exit(test, &data->base); + kunit_kfree(test, test->priv); +} + +static int suite_test_vt_and_user_connected_init(struct kunit *test) +{ + int result = suite_test_vt_init(test); + struct evdi_vt_test *data = (struct evdi_vt_test *)test->priv; + + KUNIT_EXPECT_EQ(test, result, 0); + evdi_fake_compositor_create(test); + evdi_fake_user_client_create(test); + + KUNIT_EXPECT_NE(test, data->dpms_mode, DRM_MODE_DPMS_OFF); + evdi_fake_user_client_connect(test, data->base.dev); + evdi_fake_compositor_connect(test, data->base.dev); + + return result; +} + +static void suite_test_vt_and_user_connected_exit(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + evdi_fake_compositor_disconnect(test, data->base.dev); + evdi_fake_user_client_disconnect(test, data->base.dev); + + return suite_test_vt_exit(test); +} + +static void test_evdi_painter_registers_for_vt(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + KUNIT_EXPECT_NOT_NULL(test, data->vt_notifier->notifier_call); +} + +static void test_evdi_painter_unregisters_for_vt_on_removal(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + evdi_drm_device_remove(data->base.dev); + data->base.dev = NULL; + + KUNIT_EXPECT_NULL(test, data->vt_notifier->notifier_call); +} + +static void test_evdi_painter_when_not_connected_does_not_send_dpms_off_event_on_fg_console_change(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + + KUNIT_EXPECT_NE(test, data->dpms_mode, DRM_MODE_DPMS_OFF); + + data->vt_notifier->notifier_call(data->vt_notifier, 0, NULL); + + KUNIT_EXPECT_NE(test, data->dpms_mode, DRM_MODE_DPMS_OFF); +} + +static void test_evdi_painter_when_connected_does_not_send_dpms_off_event_when_fg_console_has_not_changed(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + struct evdi_device *evdi = (struct evdi_device *)data->base.dev->dev_private; + + data->vt_notifier->notifier_call(data->vt_notifier, 0, NULL); + + KUNIT_EXPECT_EQ(test, data->dpms_mode, DRM_MODE_DPMS_ON); + KUNIT_EXPECT_FALSE(test, evdi_painter_needs_full_modeset(evdi->painter)); +} + +static void test_evdi_painter_when_connected_sends_dpms_off_event_on_fg_console_change(struct kunit *test) +{ + struct evdi_vt_test *data = to_evdi_vt_test(test->priv); + struct evdi_device *evdi = (struct evdi_device *)data->base.dev->dev_private; + + fg_console = fg_console + 1; + + data->vt_notifier->notifier_call(data->vt_notifier, 0, NULL); + + KUNIT_EXPECT_EQ(test, data->dpms_mode, DRM_MODE_DPMS_OFF); + KUNIT_EXPECT_TRUE(test, evdi_painter_needs_full_modeset(evdi->painter)); +} + +static struct kunit_case evdi_test_cases[] = { + KUNIT_CASE(test_evdi_painter_registers_for_vt), + KUNIT_CASE(test_evdi_painter_unregisters_for_vt_on_removal), + KUNIT_CASE(test_evdi_painter_when_not_connected_does_not_send_dpms_off_event_on_fg_console_change), + {} +}; + +static struct kunit_case evdi_test_cases_with_user_connected[] = { + KUNIT_CASE(test_evdi_painter_when_connected_does_not_send_dpms_off_event_when_fg_console_has_not_changed), + KUNIT_CASE(test_evdi_painter_when_connected_sends_dpms_off_event_on_fg_console_change), + {} +}; + +static struct kunit_suite evdi_test_suite = { + .name = "drm_evdi_vt_tests", + .test_cases = evdi_test_cases, + .init = suite_test_vt_init, + .exit = suite_test_vt_exit, +}; + +static struct kunit_suite evdi_test_suite_with_connected_user = { + .name = "drm_evdi_vt_tests_with_connected_user", + .test_cases = evdi_test_cases_with_user_connected, + .init = suite_test_vt_and_user_connected_init, + .exit = suite_test_vt_and_user_connected_exit, +}; + +kunit_test_suite(evdi_test_suite_with_connected_user); +kunit_test_suite(evdi_test_suite); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/pyevdi/PyEvdi.cpp new/evdi-1.14.7/pyevdi/PyEvdi.cpp --- old/evdi-1.14.5/pyevdi/PyEvdi.cpp 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/pyevdi/PyEvdi.cpp 2024-09-20 11:14:26.000000000 +0200 @@ -40,7 +40,7 @@ { m.doc() = "Python bindings for evdi library"; - evdi_logging el; + evdi_logging el = { .function = &log_function, .user_data = nullptr}; el.function = &log_function; evdi_set_logging(el); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/pyevdi/Stats.h new/evdi-1.14.7/pyevdi/Stats.h --- old/evdi-1.14.5/pyevdi/Stats.h 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/pyevdi/Stats.h 2024-09-20 11:14:26.000000000 +0200 @@ -3,6 +3,7 @@ #define STATS_H #include <functional> +#include <chrono> #include "Buffer.h" #include "../library/evdi_lib.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/pyevdi/pytest.run.sh new/evdi-1.14.7/pyevdi/pytest.run.sh --- old/evdi-1.14.5/pyevdi/pytest.run.sh 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/pyevdi/pytest.run.sh 2024-09-20 11:14:26.000000000 +0200 @@ -1,32 +1,36 @@ #!/bin/bash set -eou pipefail -if [ ! -d .venv_evdi ]; then - # prepare python virtualenv for tests - python3 -m virtualenv .venv_evdi - source .venv_evdi/bin/activate +evdi_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) + +if [ ! -v VIRTUAL_ENV ]; then + if [ ! -d "${evdi_dir}"/.venv_evdi ]; then + # prepare python virtualenv for tests + python3 -m virtualenv "${evdi_dir}"/.venv_evdi + fi + # shellcheck disable=SC1091 + source "${evdi_dir}"/.venv_evdi/bin/activate pip3 install pytest pip3 install pytest-mock pip3 install pybind11 - - # build module, library, pybindings - cd ../library - make - cd ../module - lsmod | grep evdi > /dev/null || sudo make install_dkms - - cd ../pyevdi - make - - cp ../library/libevdi.so* .venv_evdi/lib/ - cp PyEvdi*.so* $(pybind11-config --pkgconfigdir)/../../../ - deactivate - - # add evdi device - lsmod | grep evdi > /dev/null || sudo modprobe evdi - [ $(cat /sys/devices/evdi/count) == "0" ] && echo 1 | sudo tee -a /sys/devices/evdi/add && sleep 1 fi -source .venv_evdi/bin/activate -LD_LIBRARY_PATH=$VIRTUAL_ENV/lib pytest $@ + +# build module, library, pybindings +cd "${evdi_dir}"/library +make +cd "${evdi_dir}"/module +lsmod | grep evdi > /dev/null || sudo make install_dkms + +cd "${evdi_dir}"/pyevdi +make + +cp "${evdi_dir}"/library/libevdi.so* "${VIRTUAL_ENV}"/lib/ +cp PyEvdi*.so* "$(pybind11-config --pkgconfigdir)"/../../../ + +# add evdi device +lsmod | grep evdi > /dev/null || sudo modprobe evdi +[ "$(cat /sys/devices/evdi/count)" == "0" ] && echo 1 | sudo tee -a /sys/devices/evdi/add && sleep 1 + +LD_LIBRARY_PATH=$VIRTUAL_ENV/lib pytest "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/evdi-1.14.5/pyevdi/test/test_connect.py new/evdi-1.14.7/pyevdi/test/test_connect.py --- old/evdi-1.14.5/pyevdi/test/test_connect.py 2024-06-26 10:30:41.000000000 +0200 +++ new/evdi-1.14.7/pyevdi/test/test_connect.py 2024-09-20 11:14:26.000000000 +0200 @@ -5,6 +5,18 @@ import time import logging +(a)pytest.fixture +def pyevdi_card(): + card = PyEvdi.Card(utilities.get_available_evdi_card()) + yield card + card.close() + +(a)pytest.fixture +def pyevdi_connect(pyevdi_card): + edid = utilities.get_edid() + pyevdi_card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) + yield + pyevdi_card.disconnect() logging.getLogger().setLevel(20); @@ -13,43 +25,27 @@ @pytest.mark.skipif(utilities.get_available_evdi_card() == -1, reason = 'No available device.') @pytest.mark.skipif(utilities.get_available_evdi_card() == -1 and utilities.is_not_running_as_root(), reason = 'Please run test as root.') -def testModeChangedHandlerCalledAfterConnect(mocker): +def test_mode_changed_handler_called_after_connect(mocker, pyevdi_card, pyevdi_connect): mock_requests = mocker.patch("test_connect.my_mode_changed_handler", return_value = None) - - card = PyEvdi.Card(utilities.get_available_evdi_card()) - edid = utilities.get_edid() - card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) - + card = pyevdi_card card.mode_changed_handler = my_mode_changed_handler - timoutms=100 - start_time = time.time() while time.time() < start_time + 60 and not mock_requests.called: card.handle_events(timoutms) - card.disconnect() - card.close() - mock_requests.assert_called() @pytest.mark.skipif(utilities.get_available_evdi_card() == -1, reason = 'No available device.') @pytest.mark.skipif(utilities.get_available_evdi_card() == -1 and utilities.is_not_running_as_root(), reason = 'Please run test as root.') -def testHandlingEventsTenTimesWithDefaultHandlers(): - card = PyEvdi.Card(utilities.get_available_evdi_card()) - - edid = utilities.get_edid() - card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) - - +def test_handling_events_ten_times_with_default_handlers(pyevdi_card, pyevdi_connect): + card = pyevdi_card timoutms=1000 + for i in range(10): card.handle_events(timoutms) - card.disconnect() - card.close() - def my_acquire_framebuffer_handler(buffer) -> None: print("received buffer", buffer.id) print("rect_count:", buffer.rect_count, "\nrects:") @@ -59,34 +55,39 @@ @pytest.mark.skipif(utilities.get_available_evdi_card() == -1, reason = 'No available device.') @pytest.mark.skipif(utilities.get_available_evdi_card() == -1 and utilities.is_not_running_as_root(), reason = 'Please run test as root.') -def testHandlingEventsTenTimesWithAquireFramebufferSet(): - card = PyEvdi.Card(utilities.get_available_evdi_card()) - +def test_handling_events_ten_times_with_aquire_framebuffer_set(pyevdi_card, pyevdi_connect): + card = pyevdi_card card.acquire_framebuffer_handler = my_acquire_framebuffer_handler - - edid = utilities.get_edid() - card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) - timoutms=1000 + for i in range(10): card.handle_events(timoutms) - card.disconnect() - card.close() - @pytest.mark.skipif(utilities.get_available_evdi_card() == -1 and utilities.is_not_running_as_root(), reason = 'Please run test as root.') -def testReadingBuffer(): +def test_reading_buffer(): stats = PyEvdi.MemoryAccessStats() card = PyEvdi.Card(utilities.get_available_evdi_card(), stats) - card.acquire_framebuffer_handler = stats - edid = utilities.get_edid() - card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) + card.connect(edid, len(edid), utilities._FullHDAreaLimit, utilities._FullHDAreaLimit * utilities._60Hz) card.handle_events(1000) assert stats.totalGrabPixelsTime() > 0 card.disconnect() card.close() +(a)pytest.mark.skipif(utilities.get_available_evdi_card() == -1, reason = 'No available device.') +(a)pytest.mark.skipif(utilities.get_available_evdi_card() == -1 and utilities.is_not_running_as_root(), reason = 'Please run test as root.') +def test_time_of_first_frame(pyevdi_card, pyevdi_connect): + # never fails, because wait_for_master + # does not timeout when the card is opened + start = time.time() + card = pyevdi_card + timeout_in_seconds_to_recieve_frame = 2 + ms_in_s = 1000 + + card.handle_events(timeout_in_seconds_to_recieve_frame * ms_in_s) + end = time.time() + + assert end - start < timeout_in_seconds_to_recieve_frame, 'Turning on is too long' ++++++ evdi.obsinfo ++++++ --- /var/tmp/diff_new_pack.3UjMHO/_old 2024-10-04 17:11:39.575632801 +0200 +++ /var/tmp/diff_new_pack.3UjMHO/_new 2024-10-04 17:11:39.579632967 +0200 @@ -1,5 +1,5 @@ name: evdi -version: 1.14.5 -mtime: 1719390641 -commit: cbc3c4f42cd33e31d453ff79c2b945ea6e3d32f3 +version: 1.14.7 +mtime: 1726823666 +commit: 14286c973dba40199c977ade9d6dca8a19f93e61

1 0