openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2021
- 1 participants
- 2358 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmlgraphics-batik for openSUSE:Factory checked in at 2021-02-01 13:24:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-batik"
Mon Feb 1 13:24:44 2021 rev:23 rq:866484 version:1.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes 2020-06-17 14:47:04.948315969 +0200
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28504/xmlgraphics-batik.changes 2021-02-01 13:24:46.361781904 +0100
@@ -1,0 +2,8 @@
+Sun Jan 24 17:54:37 UTC 2021 - Fridrich Strba <fstrba(a)suse.com>
+
+- Upgrade to version 1.14
+ * BATIK-1284: Dont load DTDs in NodePickerPanel
+ * BATIK-1292: Remove console message "About to transcoder source
+ of type: ..."
+
+-------------------------------------------------------------------
Old:
----
batik-src-1.13.tar.gz
New:
----
batik-src-1.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-batik.spec ++++++
--- /var/tmp/diff_new_pack.iVKpPV/_old 2021-02-01 13:24:47.333783429 +0100
+++ /var/tmp/diff_new_pack.iVKpPV/_new 2021-02-01 13:24:47.337783436 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xmlgraphics-batik
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%global classpath xmlgraphics-batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
Name: xmlgraphics-batik
-Version: 1.13
+Version: 1.14
Release: 0
Summary: Scalable Vector Graphics for Java
License: Apache-2.0
++++++ batik-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2020-06-16 14:47:45.815771195 +0200
+++ new/common.xml 2021-01-24 18:55:57.695540731 +0100
@@ -3,7 +3,7 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="1.13"/>
+ <property name="project.version" value="1.14"/>
<property name="project.groupId" value="org.apache.xmlgraphics"/>
<property name="project.organization.name" value="Apache Software Foundation"/>
<property name="project.organization.url" value="http://www.apache.org/"/>
++++++ batik-src-1.13.tar.gz -> batik-src-1.14.tar.gz ++++++
/work/SRC/openSUSE:Factory/xmlgraphics-batik/batik-src-1.13.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28504/batik-src-1.14.tar.gz differ: char 21, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2021-02-01 13:24:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop"
Mon Feb 1 13:24:41 2021 rev:46 rq:866483 version:2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes 2020-06-08 23:44:00.141358980 +0200
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.28504/xmlgraphics-fop.changes 2021-02-01 13:24:44.001778203 +0100
@@ -1,0 +2,12 @@
+Sun Jan 24 18:01:22 UTC 2021 - Fridrich Strba <fstrba(a)suse.com>
+
+- version 2.6
+ * Support OTF/TTF SVG fonts
+ * Allow overpaint of PDF border
+
+-------------------------------------------------------------------
+Sat Jan 23 18:39:32 UTC 2021 - Bernhard Wiedemann <bwiedemann(a)suse.com>
+
+- Add reproducible.patch to override build date (boo#1047218)
+
+-------------------------------------------------------------------
Old:
----
fop-2.5-src.tar.gz
New:
----
fop-2.6-src.tar.gz
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-fop.spec ++++++
--- /var/tmp/diff_new_pack.ewVfwG/_old 2021-02-01 13:24:45.157780016 +0100
+++ /var/tmp/diff_new_pack.ewVfwG/_new 2021-02-01 13:24:45.161780022 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xmlgraphics-fop
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%define bname fop
Name: xmlgraphics-fop
-Version: 2.5
+Version: 2.6
Release: 0
Summary: Formatter for Printing XSLT Processed XML Files
License: Apache-2.0
@@ -42,6 +42,7 @@
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024
Patch5: reproducible-build-manifest.patch
Patch6: fop-2.5-QDox-2.0.patch
+Patch7: reproducible.patch
BuildRequires: ant >= 1.8.4
BuildRequires: apache-pdfbox >= 2.0
BuildRequires: commons-io >= 2.4
@@ -93,6 +94,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# Replace keyword "VERSION" in XML files with the real one:
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
++++++ fop-2.5-src.tar.gz -> fop-2.6-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/xmlgraphics-fop/fop-2.5-src.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.28504/fop-2.6-src.tar.gz differ: char 14, line 1
++++++ reproducible.patch ++++++
https://github.com/apache/xmlgraphics-fop/pull/65
partial fix for
https://issues.apache.org/jira/browse/FOP-2854
https://github.com/openSUSE/daps/issues/482
commit 0d3f0f9a473aad6f315fd60cc6ed1447afb791ef
Author: Bernhard M. Wiedemann <bwiedemann(a)suse.de>
Date: Wed Dec 23 13:53:56 2020 +0100
FOP-2854: Allow to override CreationDate
Allow to override build date with SOURCE_DATE_EPOCH
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
This patch was done while working on reproducible builds for openSUSE.
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFMetadata.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFMetadata.java
index 3af9af606..ff708e371 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFMetadata.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFMetadata.java
@@ -134,7 +134,9 @@ public class PDFMetadata extends PDFStream {
//Set creation date if not available, yet
if (info.getCreationDate() == null) {
- Date d = new Date();
+ Date d = System.getenv("SOURCE_DATE_EPOCH") == null ?
+ new Date() :
+ new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
info.setCreationDate(d);
}
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmlgraphics-commons for openSUSE:Factory checked in at 2021-02-01 13:24:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-commons (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-commons.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-commons"
Mon Feb 1 13:24:39 2021 rev:27 rq:866482 version:2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-commons/xmlgraphics-commons.changes 2020-06-08 23:43:53.441338312 +0200
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-commons.new.28504/xmlgraphics-commons.changes 2021-02-01 13:24:41.389774105 +0100
@@ -1,0 +2,10 @@
+Sun Jan 24 18:23:07 UTC 2021 - Fridrich Strba <fstrba(a)suse.com>
+
+- Update to version 2.6:
+ * minor release
+ * changes:
+ + Fix test on Windows
+ + XGC-122: Dont load DTDs in XMP
+ + XGC-123: Decode image at page load rather than document load
+
+-------------------------------------------------------------------
Old:
----
xmlgraphics-commons-2.4-src.tar.gz
New:
----
xmlgraphics-commons-2.6-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-commons.spec ++++++
--- /var/tmp/diff_new_pack.lsHUSR/_old 2021-02-01 13:24:42.121775253 +0100
+++ /var/tmp/diff_new_pack.lsHUSR/_new 2021-02-01 13:24:42.125775260 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xmlgraphics-commons
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: xmlgraphics-commons
-Version: 2.4
+Version: 2.6
Release: 0
Summary: XML Graphics Commons
License: Apache-2.0
++++++ xmlgraphics-commons-2.4-src.tar.gz -> xmlgraphics-commons-2.6-src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/NOTICE new/xmlgraphics-commons-2.6/NOTICE
--- old/xmlgraphics-commons-2.4/NOTICE 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/NOTICE 2021-01-12 11:44:35.000000000 +0100
@@ -1,5 +1,5 @@
Apache XML Graphics Commons
-Copyright 2006-2019 The Apache Software Foundation
+Copyright 2006-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/README new/xmlgraphics-commons-2.6/README
--- old/xmlgraphics-commons-2.4/README 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/README 2021-01-12 11:44:35.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: README 1868849 2019-10-24 07:50:09Z ssteiner $
+$Id: README 1885379 2021-01-12 09:32:59Z ssteiner $
==============================================================================
APACHE XML GRAPHICS COMMONS - README
@@ -82,6 +82,11 @@
For more detailed info about the changes, please see:
http://xmlgraphics.apache.org/commons/changes.html
+Version 2.6
+--------------
+
+Minor release to be used with FOP 2.6
+
Version 2.4
--------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/build.properties new/xmlgraphics-commons-2.6/build.properties
--- old/xmlgraphics-commons-2.4/build.properties 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/build.properties 2021-01-12 11:44:35.000000000 +0100
@@ -34,7 +34,7 @@
## ===================================================================
## 3. Project specific properties
-version = 2.4
+version = 2.6
## Allows you to switch off the compilation of the internal image
## codecs which depend on Sun-private classes. Setting this to true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/build.xml new/xmlgraphics-commons-2.6/build.xml
--- old/xmlgraphics-commons-2.4/build.xml 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/build.xml 2021-01-12 11:44:35.000000000 +0100
@@ -25,7 +25,7 @@
<property name="Name" value="Apache XML Graphics Commons"/>
<property name="name" value="xmlgraphics-commons"/>
- <property name="year" value="1999-2019"/>
+ <property name="year" value="1999-2021"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/pom.xml new/xmlgraphics-commons-2.6/pom.xml
--- old/xmlgraphics-commons-2.4/pom.xml 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/pom.xml 2021-01-12 11:44:35.000000000 +0100
@@ -4,7 +4,7 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>XML Graphics Commons</description>
<url>http://xmlgraphics.apache.org/commons/</url>
@@ -88,8 +88,6 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
- <executable>${jdk.path}/bin/javac</executable>
- <fork>true</fork>
</configuration>
</plugin>
<plugin>
@@ -174,6 +172,33 @@
</testResource>
</testResources>
</build>
+
+ <profiles>
+ <profile>
+ <id>custom-javac</id>
+ <activation>
+ <property>
+ <name>jdk.path</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <executable>${jdk.path}/bin/javac</executable>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<reporting>
<plugins>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/src/main/java/org/apache/xmlgraphics/ps/ImageFormGenerator.java new/xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/ImageFormGenerator.java
--- old/xmlgraphics-commons-2.4/src/main/java/org/apache/xmlgraphics/ps/ImageFormGenerator.java 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/ImageFormGenerator.java 2021-01-12 11:44:35.000000000 +0100
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: ImageFormGenerator.java 750418 2009-03-05 11:03:54Z vhennebert $ */
+/* $Id: ImageFormGenerator.java 1881060 2020-08-21 15:38:04Z ssteiner $ */
package org.apache.xmlgraphics.ps;
@@ -114,7 +114,7 @@
return "/ASCII85Decode filter " + implicitFilter + " filter";
} else {
if (gen.getPSLevel() >= 3) {
- return "/ASCII85Decode filter /FlateDecode filter";
+ return "/ASCII85Decode filter";
} else {
return "/ASCII85Decode filter /RunLengthDecode filter";
}
@@ -133,6 +133,12 @@
dataSource = "{ " + getDataName() + " i get /i i 1 add store } bind";
} else {
dataSource = getDataName();
+ if (gen.getPSLevel() >= 3) {
+ String implicitFilter = encoder.getImplicitFilter();
+ if (implicitFilter == null) {
+ dataSource += " /FlateDecode filter";
+ }
+ }
}
AffineTransform at = new AffineTransform();
at.scale(getDimensions().getWidth(), getDimensions().getHeight());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/src/main/java/org/apache/xmlgraphics/xmp/XMPParser.java new/xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/xmp/XMPParser.java
--- old/xmlgraphics-commons-2.4/src/main/java/org/apache/xmlgraphics/xmp/XMPParser.java 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/xmp/XMPParser.java 2021-01-12 11:44:35.000000000 +0100
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-/* $Id: XMPParser.java 1345683 2012-06-03 14:50:33Z gadams $ */
+/* $Id: XMPParser.java 1878394 2020-06-02 13:18:41Z ssteiner $ */
package org.apache.xmlgraphics.xmp;
import java.net.URL;
+import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
@@ -54,6 +55,8 @@
*/
public static Metadata parseXMP(Source src) throws TransformerException {
TransformerFactory tFactory = TransformerFactory.newInstance();
+ tFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ tFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
Transformer transformer = tFactory.newTransformer();
XMPHandler handler = createXMPHandler();
SAXResult res = new SAXResult(handler);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/ps/FormGeneratorTestCase.java new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/ps/FormGeneratorTestCase.java
--- old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/ps/FormGeneratorTestCase.java 1970-01-01 01:00:00.000000000 +0100
+++ new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/ps/FormGeneratorTestCase.java 2021-01-12 11:44:35.000000000 +0100
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.xmlgraphics.ps;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.color.ColorSpace;
+
+
+import java.awt.geom.Dimension2D;
+import java.awt.image.BufferedImage;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.xmlgraphics.java2d.Dimension2DDouble;
+import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
+
+
+public class FormGeneratorTestCase {
+ @Test
+ public void testGeneratePaintProc() throws IOException {
+ Dimension2D dimension = new Dimension2DDouble(300, 500);
+ BufferedImage im = new BufferedImage(100, 75, BufferedImage.TYPE_INT_ARGB);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ImageFormGenerator formImageGen = new ImageFormGenerator("form", "title", dimension, im, false);
+ PSGenerator gen = new PSGenerator(out);
+ formImageGen.generatePaintProc(gen);
+ String test = out.toString("UTF-8");
+
+ String expected = " form:Data 0 setfileposition\n"
+ + "[300 0 0 500 0 0] CT\n"
+ + "/DeviceRGB setcolorspace\n"
+ + "<<\n";
+ Assert.assertTrue(test.contains(expected));
+ Assert.assertTrue(test.contains(" /DataSource form:Data"));
+ Assert.assertTrue(test.contains(" /ImageMatrix [100 0 0 75 0 0]\n"));
+ Assert.assertTrue(test.contains(" /BitsPerComponent 8\n"));
+ Assert.assertTrue(test.contains(" /Height 75\n"));
+ Assert.assertTrue(test.contains(" /ImageType 1\n"));
+ Assert.assertTrue(test.contains(" /Decode [0 1 0 1 0 1]\n"));
+ Assert.assertTrue(test.contains(">> image\n"));
+ out.reset();
+ im = null;
+
+ Color c = Color.BLUE;
+ Dimension dimensionPX = new Dimension(200, 400);
+ ImageEncoder enco = ImageEncodingHelper.createRenderedImageEncoder(im);
+ ColorSpace cs = new NamedColorSpace("myColor", c);
+ formImageGen = new ImageFormGenerator("form", "title", dimension, dimensionPX, enco, cs, false);
+ gen = new PSGenerator(out);
+ gen.setPSLevel(2);
+ formImageGen.generatePaintProc(gen);
+ test = out.toString("UTF-8");
+ expected = " userdict /i 0 put\n"
+ + "[300 0 0 500 0 0] CT\n"
+ + "/DeviceGray setcolorspace\n"
+ + "<<\n";
+ Assert.assertTrue(test.contains(expected));
+ Assert.assertTrue(test.contains(" /DataSource { form:Data i get /i i 1 add store } bind\n"));
+ Assert.assertTrue(test.contains(" /ImageMatrix [200 0 0 400 0 0]\n"));
+ Assert.assertTrue(test.contains(" /Height 400\n"));
+ Assert.assertTrue(test.contains(" /BitsPerComponent 8\n"));
+ Assert.assertTrue(test.contains(" /ImageType 1\n"));
+ Assert.assertTrue(test.contains(" /Decode [0 1]\n"));
+ Assert.assertTrue(test.contains(" /Width 200\n"));
+ Assert.assertTrue(test.contains(">> image\n"));
+ }
+
+ @Test
+ public void testFlateDecodeCommand() throws IOException {
+ Dimension2D dimension = new Dimension2DDouble(300, 500);
+ BufferedImage im = new BufferedImage(100, 75, BufferedImage.TYPE_INT_ARGB);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ImageFormGenerator formImageGen = new ImageFormGenerator("form", "title", dimension, im, false);
+ PSGenerator gen = new PSGenerator(out);
+ formImageGen.generate(gen);
+ String test = out.toString("UTF-8");
+ Assert.assertTrue(test.contains("/ASCII85Decode filter\n"));
+ //FlateDecode at DataSource so executed on page load rather than document load so viewer loads faster
+ Assert.assertTrue(test.contains("/DataSource form:Data /FlateDecode filter\n"));
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java
--- old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java 2021-01-12 11:44:35.000000000 +0100
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-/* $Id: Base64TestCase.java 1732018 2016-02-24 04:51:06Z gadams $ */
+/* $Id: Base64TestCase.java 1876186 2020-04-06 13:37:10Z ssteiner $ */
package org.apache.xmlgraphics.util.io;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -31,15 +33,17 @@
import static org.junit.Assert.fail;
+import org.apache.commons.io.IOUtils;
+
/**
* This test validates that the Base64 encoder/decoders work properly.
*
- * @version $Id: Base64TestCase.java 1732018 2016-02-24 04:51:06Z gadams $
+ * @version $Id: Base64TestCase.java 1876186 2020-04-06 13:37:10Z ssteiner $
*/
public class Base64TestCase {
private void innerBase64Test(String action, URL in, URL ref) throws Exception {
- InputStream inIS = in.openStream();
+ InputStream inIS = dos2Unix(in);
if (action.equals("ROUND")) {
ref = in;
@@ -47,7 +51,7 @@
fail("Bad action string");
}
- InputStream refIS = ref.openStream();
+ InputStream refIS = dos2Unix(ref);
if (action.equals("ENCODE") || action.equals("ROUND")) {
// We need to encode the incomming data
@@ -74,6 +78,21 @@
}
}
+ private InputStream dos2Unix(URL url) throws IOException {
+ InputStream is = url.openStream();
+ byte[] data = IOUtils.toByteArray(is);
+ if (data.length > 1 && data[data.length - 1] == '\n') {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ for (byte b : data) {
+ if (b != '\r') {
+ bos.write(b);
+ }
+ }
+ return new ByteArrayInputStream(bos.toByteArray());
+ }
+ return new ByteArrayInputStream(data);
+ }
+
private void innerBase64Test(String action, String in, String ref) throws Exception {
final String baseURL = "file:src/test/resources/org/apache/xmlgraphics/util/io/";
innerBase64Test(action, new URL(baseURL + in), new URL(baseURL + ref));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/xmp/XMPParserTestCase.java new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/xmp/XMPParserTestCase.java
--- old/xmlgraphics-commons-2.4/src/test/java/org/apache/xmlgraphics/xmp/XMPParserTestCase.java 2019-10-25 10:01:30.000000000 +0200
+++ new/xmlgraphics-commons-2.6/src/test/java/org/apache/xmlgraphics/xmp/XMPParserTestCase.java 2021-01-12 11:44:35.000000000 +0100
@@ -15,20 +15,25 @@
* limitations under the License.
*/
-/* $Id: XMPParserTestCase.java 1732018 2016-02-24 04:51:06Z gadams $ */
+/* $Id: XMPParserTestCase.java 1878394 2020-06-02 13:18:41Z ssteiner $ */
package org.apache.xmlgraphics.xmp;
+import java.io.StringReader;
import java.net.URL;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.apache.xmlgraphics.xmp.schemas.DublinCoreAdapter;
import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema;
@@ -189,4 +194,18 @@
assertNull(title); //Empty value treated same as not existant
}
+ @Test
+ public void testExternalDTD() {
+ String payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ + "<!DOCTYPE root [\n<!ENTITY % remote SYSTEM \"http://127.0.0.1:9999/eval.xml\">\n%remote;]>\n"
+ + "<root></root>";
+ StreamSource streamSource = new StreamSource(new StringReader(payload));
+ String msg = "";
+ try {
+ XMPParser.parseXMP(streamSource);
+ } catch (TransformerException e) {
+ msg = e.getMessage();
+ }
+ assertTrue(msg, msg.contains("access is not allowed"));
+ }
}
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package asciidoc for openSUSE:Factory checked in at 2021-02-01 13:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/asciidoc (Old)
and /work/SRC/openSUSE:Factory/.asciidoc.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asciidoc"
Mon Feb 1 13:24:37 2021 rev:48 rq:866475 version:9.0.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/asciidoc/asciidoc.changes 2020-11-05 21:55:00.244172827 +0100
+++ /work/SRC/openSUSE:Factory/.asciidoc.new.28504/asciidoc.changes 2021-02-01 13:24:37.745768389 +0100
@@ -1,0 +2,7 @@
+Sun Jan 24 14:42:49 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 9.0.5:
+ - Use config newline setting in system attribute evaulation
+ - Update to deadsnakes/python(a)v2.0.2
+
+-------------------------------------------------------------------
Old:
----
asciidoc-9.0.4.tar.gz
New:
----
asciidoc-9.0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ asciidoc.spec ++++++
--- /var/tmp/diff_new_pack.ueg1KO/_old 2021-02-01 13:24:38.429769462 +0100
+++ /var/tmp/diff_new_pack.ueg1KO/_new 2021-02-01 13:24:38.429769462 +0100
@@ -1,7 +1,7 @@
#
# spec file for package asciidoc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: asciidoc
-Version: 9.0.4
+Version: 9.0.5
Release: 0
Summary: Text-Based Document Generation
License: GPL-2.0-or-later
++++++ asciidoc-9.0.4.tar.gz -> asciidoc-9.0.5.tar.gz ++++++
++++ 2063 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jack for openSUSE:Factory checked in at 2021-02-01 13:24:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jack (Old)
and /work/SRC/openSUSE:Factory/.jack.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jack"
Mon Feb 1 13:24:34 2021 rev:68 rq:866445 version:1.9.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/jack/jack.changes 2021-01-19 16:01:14.755293950 +0100
+++ /work/SRC/openSUSE:Factory/.jack.new.28504/jack.changes 2021-02-01 13:24:36.501766438 +0100
@@ -1,0 +2,11 @@
+Sun Jan 24 16:01:41 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.9.17:
+ * Fix jack_control stopping after first command iteration
+ * Fix registry keys for Windows, add 32bit compat ones on 64bit
+ * Fix library compat/current version under macOS
+ * Fix return codes of jackd on success
+ * Ignore DB_VERSION_MISMATCH error on windows, it is expected
+ * Remove old workaround for asio4all, as it breaks with jack-router
+
+-------------------------------------------------------------------
@@ -9 +20 @@
-- Update to 0.9.16
+- Update to 1.9.16
Old:
----
jack-1.9.16.tar.gz
New:
----
jack-1.9.17.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jack.spec ++++++
--- /var/tmp/diff_new_pack.7a7h5F/_old 2021-02-01 13:24:37.149767455 +0100
+++ /var/tmp/diff_new_pack.7a7h5F/_new 2021-02-01 13:24:37.153767461 +0100
@@ -22,7 +22,7 @@
%define wdbus 1
%define sonum 0
Name: jack
-Version: 1.9.16
+Version: 1.9.17
Release: 0
#to_be_filled_by_service
Summary: Jack-Audio Connection Kit
++++++ jack-1.9.16.tar.gz -> jack-1.9.17.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/.github/ISSUE_TEMPLATE/bug_report.md new/jack2-1.9.17/.github/ISSUE_TEMPLATE/bug_report.md
--- old/jack2-1.9.16/.github/ISSUE_TEMPLATE/bug_report.md 1970-01-01 01:00:00.000000000 +0100
+++ new/jack2-1.9.17/.github/ISSUE_TEMPLATE/bug_report.md 2021-01-15 16:00:40.000000000 +0100
@@ -0,0 +1,31 @@
+---
+name: Bug report ����
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+---
+
+<!-- NOTE: Bugs reported here are exclusively for jack2. -->
+
+## Describe the bug
+
+A clear and concise description of what the bug is.
+
+## Environment
+
+* **JACK Version:** Which version of jack2 are you using? (e.g. the output of `jackd --version` or a git commit checksum)
+* **Operating System:** What operating system or distribution in which version are you using? (e.g. Linux, macOS, Windows)
+* **Installation:** How did you install jack2? (e.g. package manager, from source)
+
+## Steps To Reproduce
+
+```bash
+# Paste a minimal code example here (e.g. about how you started JACK)
+```
+
+### Expected vs. actual behavior
+
+A clear and concise description of what you expected to happen vs. what happened.
+
+<!-- Paste error messages in code blocks in their entirety. Use gist if very long or attach log files. -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/.github/ISSUE_TEMPLATE/feature_request.md new/jack2-1.9.17/.github/ISSUE_TEMPLATE/feature_request.md
--- old/jack2-1.9.16/.github/ISSUE_TEMPLATE/feature_request.md 1970-01-01 01:00:00.000000000 +0100
+++ new/jack2-1.9.17/.github/ISSUE_TEMPLATE/feature_request.md 2021-01-15 16:00:40.000000000 +0100
@@ -0,0 +1,21 @@
+---
+name: Feature Request ����
+about: Suggest a new idea for the project.
+labels: enhancement
+---
+
+<!-- NOTE: Feature requests suggested here are exclusively for jack2. -->
+
+## Summary
+
+Brief explanation of the feature.
+
+### Basic example
+
+If the proposal involves a new feature or change in behavior, include a basic code example. Omit this section if it's not applicable.
+
+### Motivation
+
+Why are we doing this? What use cases does it support? What is the expected outcome?
+
+<!-- We are always happy about new contributors. If you can provide a pull request yourself for the feature that you are proposing, please say so! -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/ChangeLog.rst new/jack2-1.9.17/ChangeLog.rst
--- old/jack2-1.9.16/ChangeLog.rst 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/ChangeLog.rst 2021-01-15 16:00:40.000000000 +0100
@@ -1,6 +1,21 @@
ChangeLog
#########
+* 1.9.17 (2021-01-15)
+
+ * Fix jack_control stopping after first command iteration
+ * Fix registry keys for Windows, add 32bit compat ones on 64bit
+ * Fix library compat/current version under macOS
+ * Fix return codes of jackd on success
+ * Ignore DB_VERSION_MISMATCH error on windows, it is expected
+ * Remove old workaround for asio4all, as it breaks with jack-router
+
+External changes, related to macOS/Windows installer:
+ * Add jack-router to Windows installer, opt-in
+ * Support for arm64 macOS builds
+ * Show welcome and license pages on windows installer
+ * Update QjackCtl used in macOS/Windows installers to v0.9.0, with some commits cherry-picked from develop branch
+
* 1.9.16 (2020-10-16)
* Fix/revert a change in how meta-data definitions were exposed (regression in 1.9.15)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/JackConstants.h new/jack2-1.9.17/common/JackConstants.h
--- old/jack2-1.9.16/common/JackConstants.h 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/JackConstants.h 2021-01-15 16:00:40.000000000 +0100
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#define VERSION "1.9.16"
+#define VERSION "1.9.17"
#define BUFFER_SIZE_MAX 8192
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/JackMetadata.cpp new/jack2-1.9.17/common/JackMetadata.cpp
--- old/jack2-1.9.16/common/JackMetadata.cpp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/JackMetadata.cpp 2021-01-15 16:00:40.000000000 +0100
@@ -123,9 +123,32 @@
#endif
if ((ret = fDBenv->open (fDBenv, dbpath, DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL | DB_THREAD, 0)) != 0) {
- jack_error ("cannot open DB environment: %s", db_strerror (ret));
- fDBenv = NULL;
- return -1;
+#ifdef WIN32
+ // new versions of jack2 are built with HAVE_MIXED_SIZE_ADDRESSING, which induces this error, this is expected
+ if (ret == DB_VERSION_MISMATCH) {
+ // cleanup old stuff
+ snprintf (dbpath, sizeof(dbpath), "%s/jack_db/metadata.db", fDBFilesDir);
+ remove (dbpath);
+
+ snprintf (dbpath, sizeof(dbpath), "%s/jack_db/__db.001", fDBFilesDir);
+ remove (dbpath);
+
+ snprintf (dbpath, sizeof(dbpath), "%s/jack_db/__db.002", fDBFilesDir);
+ remove (dbpath);
+
+ snprintf (dbpath, sizeof(dbpath), "%s/jack_db/__db.003", fDBFilesDir);
+ remove (dbpath);
+
+ // try again fresh
+ ret = fDBenv->open (fDBenv, dbpath, DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL | DB_THREAD, 0);
+ }
+ if (ret != 0)
+#endif
+ {
+ jack_error ("cannot open DB environment: %s", db_strerror (ret));
+ fDBenv = NULL;
+ return -1;
+ }
}
if ((ret = db_create (&fDB, fDBenv, 0)) != 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/Jackdmp.cpp new/jack2-1.9.17/common/Jackdmp.cpp
--- old/jack2-1.9.16/common/Jackdmp.cpp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/Jackdmp.cpp 2021-01-15 16:00:40.000000000 +0100
@@ -97,7 +97,7 @@
fprintf(file, "jackdmp " VERSION "\n"
"Copyright 2001-2005 Paul Davis and others.\n"
"Copyright 2004-2016 Grame.\n"
- "Copyright 2016-2020 Filipe Coelho.\n"
+ "Copyright 2016-2021 Filipe Coelho.\n"
"jackdmp comes with ABSOLUTELY NO WARRANTY\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; see the file COPYING for details\n");
@@ -253,8 +253,6 @@
printf( "jackdmp version " VERSION " tmpdir "
jack_server_dir " protocol %d" "\n",
JACK_PROTOCOL_VERSION);
- exit(-1);
-
}
int main(int argc, char** argv)
@@ -269,6 +267,7 @@
for(int a = 1; a < argc; ++a) {
if( !strcmp(argv[a], "--version") || !strcmp(argv[a], "-V") ) {
print_version();
+ return 0;
}
}
const char *options = "-d:X:I:P:uvshrRL:STFl:t:mn:p:C:"
@@ -495,11 +494,13 @@
}
break;
+ case 'h':
+ usage(stdout, server_ctl);
+ return_value = 0;
+ goto destroy_server;
+
default:
fprintf(stderr, "unknown option character %c\n", optopt);
- /*fallthru*/
-
- case 'h':
usage(stdout, server_ctl);
goto destroy_server;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/jack/systemdeps.h new/jack2-1.9.17/common/jack/systemdeps.h
--- old/jack2-1.9.16/common/jack/systemdeps.h 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/jack/systemdeps.h 2021-01-15 16:00:40.000000000 +0100
@@ -124,10 +124,10 @@
#endif /* __APPLE__ || __linux__ || __sun__ || sun */
-#if defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__ppc__) || defined(__powerpc__)
+#if (defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__ppc__) || defined(__powerpc__)) && !defined(__APPLE__)
#undef POST_PACKED_STRUCTURE
#define POST_PACKED_STRUCTURE
-#endif /* __arm__ || __aarch64__ || __ppc__ || __powerpc__ */
+#endif /* __arm__ || __aarch64__ || __mips__ || __ppc__ || __powerpc__ */
/** define JACK_LIB_EXPORT, useful for internal clients */
#if defined(_WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/shm.h new/jack2-1.9.17/common/shm.h
--- old/jack2-1.9.16/common/shm.h 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/shm.h 2021-01-15 16:00:40.000000000 +0100
@@ -105,7 +105,12 @@
shm_ANDROID = 4 /* Android shared memory */
} jack_shmtype_t;
+#ifdef __APPLE__
+ /* we need to align and pack data to 32bit so that x86_64 and arm64 work together */
+ typedef int32_t jack_shm_registry_index_t;
+#else
typedef int16_t jack_shm_registry_index_t;
+#endif
/**
* A structure holding information about shared memory allocated by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/common/wscript new/jack2-1.9.17/common/wscript
--- old/jack2-1.9.16/common/wscript 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/common/wscript 2021-01-15 16:00:40.000000000 +0100
@@ -196,7 +196,10 @@
'../windows/JackMMCSS.cpp',
]
- if not bld.env['IS_WINDOWS']:
+ if bld.env['IS_MACOSX']:
+ clientlib.cnum = bld.env['JACK_API_VERSION']
+ clientlib.vnum = bld.env['JACK_VERSION']
+ elif not bld.env['IS_WINDOWS']:
clientlib.vnum = bld.env['JACK_API_VERSION']
if bld.env['IS_LINUX']:
@@ -304,7 +307,10 @@
'../windows/JackNetWinSocket.cpp',
]
- if not bld.env['IS_WINDOWS']:
+ if bld.env['IS_MACOSX']:
+ serverlib.cnum = bld.env['JACK_API_VERSION']
+ serverlib.vnum = bld.env['JACK_VERSION']
+ elif not bld.env['IS_WINDOWS']:
serverlib.vnum = bld.env['JACK_API_VERSION']
if bld.env['IS_LINUX']:
@@ -366,7 +372,10 @@
if bld.env['IS_WINDOWS']:
netlib.source += ['../windows/JackNetWinSocket.cpp','../windows/JackWinThread.cpp', '../windows/JackMMCSS.cpp', '../windows/JackWinTime.c']
- if not bld.env['IS_WINDOWS']:
+ if bld.env['IS_MACOSX']:
+ netlib.cnum = bld.env['JACK_API_VERSION']
+ netlib.vnum = bld.env['JACK_VERSION']
+ elif not bld.env['IS_WINDOWS']:
netlib.vnum = bld.env['JACK_API_VERSION']
create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/linux/JackLinuxFutex.cpp new/jack2-1.9.17/linux/JackLinuxFutex.cpp
--- old/jack2-1.9.16/linux/JackLinuxFutex.cpp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/linux/JackLinuxFutex.cpp 2021-01-15 16:00:40.000000000 +0100
@@ -29,6 +29,10 @@
#include <syscall.h>
#include <linux/futex.h>
+#if !defined(SYS_futex) && defined(SYS_futex_time64)
+#define SYS_futex SYS_futex_time64
+#endif
+
namespace Jack
{
@@ -67,7 +71,7 @@
if (! fFutex->internal) return true;
}
- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
+ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
return true;
}
@@ -94,7 +98,7 @@
if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
return true;
- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
return false;
}
}
@@ -122,7 +126,7 @@
if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
return true;
- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
return false;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/Jack-Info.plist new/jack2-1.9.17/macosx/Jack-Info.plist
--- old/jack2-1.9.16/macosx/Jack-Info.plist 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/Jack-Info.plist 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>Jackservermp</string>
- <key>CFBundleGetInfoString</key>
- <string>Jackdmp 1.9.13, @03-17 Paul Davis, Grame, Filipe Coelho</string>
- <key>CFBundleIdentifier</key>
- <string>com.grame.Jackmp</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>FMWK</string>
- <key>CFBundleShortVersionString</key>
- <string></string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.9.13</string>
-</dict>
-</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/JackAtomic_os.h new/jack2-1.9.17/macosx/JackAtomic_os.h
--- old/jack2-1.9.16/macosx/JackAtomic_os.h 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/JackAtomic_os.h 2021-01-15 16:00:40.000000000 +0100
@@ -48,9 +48,7 @@
return result;
}
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
+#elif defined(__i386__) || defined(__x86_64__)
#define LOCK "lock ; "
@@ -67,6 +65,13 @@
return ret;
}
+#else
+
+static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
+{
+ return __sync_bool_compare_and_swap ((UInt32*)addr, value, newvalue);
+}
+
#endif
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/coreaudio/JackCoreAudioAdapter.mm new/jack2-1.9.17/macosx/coreaudio/JackCoreAudioAdapter.mm
--- old/jack2-1.9.16/macosx/coreaudio/JackCoreAudioAdapter.mm 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/coreaudio/JackCoreAudioAdapter.mm 2021-01-15 16:00:40.000000000 +0100
@@ -911,21 +911,21 @@
}
// AUHAL
-#ifdef MAC_OS_X_VERSION_10_5
- ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
- Component HALOutput = FindNextComponent(NULL, &cd);
- err1 = OpenAComponent(HALOutput, &fAUHAL);
+#if (defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5))
+ AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
+ AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd);
+ err1 = AudioComponentInstanceNew(HALOutput, &fAUHAL);
if (err1 != noErr) {
- jack_error("Error calling OpenAComponent");
+ jack_error("Error calling AudioComponentInstanceNew");
printError(err1);
goto error;
}
#else
- AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
- AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd);
- err1 = AudioComponentInstanceNew(HALOutput, &fAUHAL);
+ ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
+ Component HALOutput = FindNextComponent(NULL, &cd);
+ err1 = OpenAComponent(HALOutput, &fAUHAL);
if (err1 != noErr) {
- jack_error("Error calling AudioComponentInstanceNew");
+ jack_error("Error calling OpenAComponent");
printError(err1);
goto error;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/coreaudio/JackCoreAudioDriver.mm new/jack2-1.9.17/macosx/coreaudio/JackCoreAudioDriver.mm
--- old/jack2-1.9.16/macosx/coreaudio/JackCoreAudioDriver.mm 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/coreaudio/JackCoreAudioDriver.mm 2021-01-15 16:00:40.000000000 +0100
@@ -1649,21 +1649,21 @@
}
// AUHAL
-#ifdef MAC_OS_X_VERSION_10_5
- ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
- Component HALOutput = FindNextComponent(NULL, &cd);
- err1 = OpenAComponent(HALOutput, &fAUHAL);
+#if (defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5))
+ AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
+ AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd);
+ err1 = AudioComponentInstanceNew(HALOutput, &fAUHAL);
if (err1 != noErr) {
- jack_error("Error calling OpenAComponent");
+ jack_error("Error calling AudioComponentInstanceNew");
printError(err1);
goto error;
}
#else
- AudioComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
- AudioComponent HALOutput = AudioComponentFindNext(NULL, &cd);
- err1 = AudioComponentInstanceNew(HALOutput, &fAUHAL);
+ ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
+ Component HALOutput = FindNextComponent(NULL, &cd);
+ err1 = OpenAComponent(HALOutput, &fAUHAL);
if (err1 != noErr) {
- jack_error("Error calling AudioComponentInstanceNew");
+ jack_error("Error calling OpenAComponent");
printError(err1);
goto error;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/install_jackdmp new/jack2-1.9.17/macosx/install_jackdmp
--- old/jack2-1.9.16/macosx/install_jackdmp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/install_jackdmp 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-# Install jackdmp and overwrite JACK installation
-
-# Plug-ins
-[ -d Panda.framework ] && sudo cp -r Panda.framework /Library/Frameworks
-[ -d JackRouter.plugin ] && sudo cp -r JackRouter.plugin /Library/Audio/Plug-Ins/HAL/
-
-# Copy libraries and exe
-sudo cp -r Jackmp.framework /Library/Frameworks/
-sudo cp -r Jackservermp.framework /Library/Frameworks/
-sudo cp -r Jacknet.framework /Library/Frameworks/
-sudo install -d /usr/local/bin
-sudo cp jackdmp /usr/local/bin
-[ -f jack_load ] && sudo cp jack_load /usr/local/bin
-[ -f jack_unload ] && sudo cp jack_unload /usr/local/bin
-[ -f jack_netsource ] && sudo cp jack_netsource /usr/local/bin
-
-# Copy drivers
-sudo install -d /usr/local/lib/jackmp
-sudo cp jack_coreaudio.so /usr/local/lib/jackmp
-sudo cp jack_coremidi.so /usr/local/lib/jackmp
-sudo cp jack_dummy.so /usr/local/lib/jackmp
-sudo cp jack_loopback.so /usr/local/lib/jackmp
-[ -f jack_net.so ] && sudo cp jack_net.so /usr/local/lib/jackmp
-[ -f jack_netone.so ] && sudo cp jack_netone.so /usr/local/lib/jackmp
-
-# Copy tools
-[ -f netmanager.so ] && sudo cp netmanager.so /usr/local/lib/jackmp
-[ -f netadapter.so ] && sudo cp netadapter.so /usr/local/lib/jackmp
-[ -f audioadapter.so ] && sudo cp audioadapter.so /usr/local/lib/jackmp
-
-# Create links to jackmp resources
-cd /usr/local/bin && [ -f jackd ] && sudo rm jackd
-
-cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo rm libjack.0.dylib
-cd /usr/local/lib && [ -f libjack.dylib ] && sudo rm libjack.dylib
-
-cd /usr/local/lib && [ -f libjackserver.0.dylib ] && sudo rm libjackserver.0.dylib
-cd /usr/local/lib && [ -f libjackserver.dylib ] && sudo rm libjackserver.dylib
-
-cd /usr/local/lib && [ -f libjacknet.dylib ] && sudo rm libjacknet.dylib
-cd /usr/local/lib && [ -f libjacknet.0.dylib ] && sudo rm libjacknet.0.dylib
-
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.dylib
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.0.dylib
-
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackservermp.framework/Jackservermp libjackserver.dylib
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackservermp.framework/Jackservermp libjackserver.0.dylib
-
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jacknet.framework/Jacknet libjacknet.dylib
-cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jacknet.framework/Jacknet libjacknet.0.dylib
-
-cd /usr/local/bin && sudo ln -s jackdmp jackd
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/macosx/remove_jackdmp new/jack2-1.9.17/macosx/remove_jackdmp
--- old/jack2-1.9.16/macosx/remove_jackdmp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/macosx/remove_jackdmp 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-# Remove jackdmp resources
-sudo rm -r "/usr/local/lib/jackmp"
-sudo rm "/usr/local/bin/jackdmp"
-sudo rm -r "/usr/local/lib/jackd"
-sudo rm "/usr/local/lib/libjackmp.dylib"
-sudo rm -r "/Library/Frameworks/Jackmp.framework"
-sudo rm -r "/Library/Frameworks/Jackservermp.framework"
-sudo rm -r "/Library/Frameworks/Jacknet.framework"
-sudo rm -r "/Library/Audio/Plug-Ins/HAL/JackRouter.plugin"
-
-# Tries to restore jack
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/tools/jack_control new/jack2-1.9.17/tools/jack_control
--- old/jack2-1.9.16/tools/jack_control 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/tools/jack_control 2021-01-15 16:00:40.000000000 +0100
@@ -397,7 +397,7 @@
print("DBus exception: %s" % str(e))
return 1
- return 0
+ return 0
if __name__ == '__main__':
sys.exit(main())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/waflib/Tools/ccroot.py new/jack2-1.9.17/waflib/Tools/ccroot.py
--- old/jack2-1.9.16/waflib/Tools/ccroot.py 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/waflib/Tools/ccroot.py 2021-01-15 16:00:40.000000000 +0100
@@ -575,12 +575,10 @@
cnum = getattr(self, 'cnum', str(nums[0]))
cnums = cnum.split('.')
- if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums:
- raise Errors.WafError('invalid compatibility version %s' % cnum)
libname = node.name
if libname.endswith('.dylib'):
- name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum)
+ name3 = libname.replace('.dylib', '.%s.dylib' % cnums[0])
name2 = libname.replace('.dylib', '.%s.dylib' % cnum)
else:
name3 = libname + '.' + self.vnum
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/windows/README_MINGW new/jack2-1.9.17/windows/README_MINGW
--- old/jack2-1.9.16/windows/README_MINGW 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/windows/README_MINGW 2021-01-15 16:00:40.000000000 +0100
@@ -1,24 +1,31 @@
-HOW TO COMPILE JACK USING WAF AND MINGW
-=======================================
+HOW TO COMPILE JACK ON WINDOWS/MINGW
+====================================
Rev. 1 - 2019-09-01 - First version
Rev. 2 - 2019-09-18 - Include contributions from @Schroedingers-Cat
Rev. 3 - 2019-12-14 - Include contributions from @Schroedingers-Cat
-
+Rev. 4 - 2020-11-27 - Rename, update intro and JackRouter build instructions
Introduction
------------
-This guide contains detailed instructions for building JACK on a modern MinGW
-installation. It was conceived as the starting point for unifying the JACK build
-process across all platforms.
-
-As this is work in progress, there are still a couple of caveats:
-
-- Asynchronous mode is unusable with low latencies
-- JackRouter still builds using a Visual Studio project
-- Lots of real world testing is needed
+This guide was originally called "How to compile JACK using WAF and MinGW"
+and later renamed to "How to compile JACK on Windows/MinGW" to avoid confusion
+with the official way of building JACK for Windows, which is cross-compiling
+on Linux. That should be considered the only officially supported method now.
+
+Latest binary releases can be found here: https://jackaudio.org/downloads/
+JackRouter here: https://github.com/jackaudio/jack-router/tree/main/binaries
+
+JACK is primarily targeted at Unix systems and thus the required toolchain is
+Unix-centric. So the majority of the guide is actually about setting up the
+required build tools. Once done, the build process itself does not differ much
+from that found on other platforms.
+
+The information here can be of interest to anyone wishing to contribute to the
+development of Windows specific code in JACK, and wants to avoid double booting,
+VMs, etc. That can be particularly helpful when it comes to debug or testing.
@@ -179,28 +186,38 @@
Compiling JackRouter
--------------------
+Source code for JackRouter is not considered part of JACK anymore so you need to
+clone an additional repository:
+
+git clone https://github.com/jackaudio/jack-router
+
Visual Studio with MFC support is needed to build the included JackRouter VS
project. The project was tested to successfully generate a 64bit version of
JackRouter.dll using Visual Studio 2017 and 2019. MFC support can be added from
the VS installer, by selecting Workloads/Visual C++ build tools/Visual C++ MFC
-for x86 and x64 (valid for VS 2017). Once ready, just open and build the project
+for x86 and x64 (valid for VS 2017).
-windows/JackRouter/JackRouter_MinGW_deps.vcxproj
+Once ready, just open and build the project
-Differences from the original JackRouter.vcxproj:
+win/JackRouter.sln
-- Depends on the asiosdk files from the previous MinGW JACK installation (i.e.,
- it points to absolute paths starting with C:\msys64\opt)
-- Links to the jack.dll.a created by the previous build, instead of libjack.lib
- This means JackRouter.dll will currently depend on libjack-0.dll
-- Force includes stdint.h and defines _STDINT_H to avoid int8_t, int32_t and
- uint32_t basic types redefinition during compilation
+Notes:
+
+- The project assumes the needed ASIO SDK is located in C:\Program Files\asiosdk
+ you can simply copy the SDK from the MinGW JACK installation, i.e. from
+ C:\msys64\opt to C:\Program Files
+- Links against C:\Program Files\JACK2\lib\libjack64.dll.a which is the libjack
+ version installed by the official installer. You will have to update that path
+ so it points to the jack.dll.a created by the MinGW build instead.
Running and distributing
------------------------
+!! This section is kept for historical reasons. The official JACK for Windows
+build method includes the necessary steps to create a installer. !!
+
An automated installation process should copy files to two destinations. One for
the JACK server binary and standalone tools, and another for the client library.
The latter is needed by JACK enabled applications in order to be able to connect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/windows/inno/win32.iss new/jack2-1.9.17/windows/inno/win32.iss
--- old/jack2-1.9.16/windows/inno/win32.iss 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/windows/inno/win32.iss 2021-01-15 16:00:40.000000000 +0100
@@ -9,45 +9,55 @@
AppVersion={#VERSION}
DefaultDirName={commonpf32}\JACK2
DisableDirPage=yes
+DisableWelcomePage=no
+LicenseFile=..\..\COPYING
OutputBaseFilename=jack2-win32-{#VERSION}
OutputDir=.
UsePreviousAppDir=no
[Types]
-Name: "full"; Description: "Full installation";
+Name: "full"; Description: "Full installation (without JACK-Router)";
+Name: "router"; Description: "Full installation (with JACK-Router)";
Name: "custom"; Description: "Custom installation"; Flags: iscustom;
[Components]
-Name: qjackctl; Description: "QJackCtl application (recommended)"; Types: full;
-Name: dev; Description: "Developer resources"; Types: full;
+Name: jackserver; Description: "JACK Server and tools"; Types: full router custom; Flags: fixed;
+Name: qjackctl; Description: "QjackCtl application (recommended)"; Types: full router;
+Name: router; Description: "JACK-Router ASIO Driver"; Types: router;
+Name: dev; Description: "Developer resources"; Types: full router;
[Files]
; icon
-Source: "jack.ico"; DestDir: "{app}";
+Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
; jackd and server libs
-Source: "win32\bin\jackd.exe"; DestDir: "{app}";
-Source: "win32\lib\libjacknet.dll"; DestDir: "{app}";
-Source: "win32\lib\libjackserver.dll"; DestDir: "{app}";
+Source: "win32\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
+Source: "win32\lib\libjacknet.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
+Source: "win32\lib\libjackserver.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
; drivers
-Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack";
+Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; Flags: ignoreversion;
; tools
-Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools";
+Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; Flags: ignoreversion;
; jack client lib (NOTE goes into windir)
-Source: "win32\lib\libjack.dll"; DestDir: "{win}";
+Source: "win32\lib\libjack.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion;
; qjackctl
-Source: "win32\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl;
-Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl;
-Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl;
+Source: "win32\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion;
+Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion;
+Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; Flags: ignoreversion;
; dev
-Source: "win32\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev;
-Source: "win32\lib\*.a"; DestDir: "{app}\lib"; Components: dev;
-Source: "win32\lib\*.def"; DestDir: "{app}\lib"; Components: dev;
-Source: "win32\lib\*.lib"; DestDir: "{app}\lib"; Components: dev;
-Source: "win32\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev;
+Source: "win32\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; Flags: ignoreversion;
+Source: "win32\lib\*.a"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win32\lib\*.def"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win32\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win32\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; Flags: ignoreversion;
+; router
+Source: "win32\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; Flags: ignoreversion;
+Source: "win32\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion regserver;
+Source: "win32\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion;
[Icons]
-Name: "{commonprograms}\QJackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
+Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
[Registry]
-Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "Location"; ValueData: "{app}\jackd.exe"
+Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "ServerExecutable"; ValueData: "{app}\jackd.exe"
+Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "Version"; ValueData: "{#VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/windows/inno/win64.iss new/jack2-1.9.17/windows/inno/win64.iss
--- old/jack2-1.9.16/windows/inno/win64.iss 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/windows/inno/win64.iss 2021-01-15 16:00:40.000000000 +0100
@@ -10,49 +10,65 @@
AppVersion={#VERSION}
DefaultDirName={commonpf64}\JACK2
DisableDirPage=yes
+DisableWelcomePage=no
+LicenseFile=..\..\COPYING
OutputBaseFilename=jack2-win64-{#VERSION}
OutputDir=.
UsePreviousAppDir=no
[Types]
-Name: "full"; Description: "Full installation";
+Name: "full"; Description: "Full installation (without JACK-Router)";
+Name: "router"; Description: "Full installation (with JACK-Router)";
Name: "custom"; Description: "Custom installation"; Flags: iscustom;
[Components]
-Name: qjackctl; Description: "QJackCtl application (recommended)"; Types: full;
-Name: dev; Description: "Developer resources"; Types: full;
+Name: jackserver; Description: "JACK Server and tools"; Types: full router custom; Flags: fixed;
+Name: qjackctl; Description: "QjackCtl application (recommended)"; Types: full router;
+Name: router; Description: "JACK-Router ASIO Driver"; Types: router;
+Name: dev; Description: "Developer resources"; Types: full router;
[Files]
; icon
-Source: "jack.ico"; DestDir: "{app}";
+Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
; jackd and server libs
-Source: "win64\bin\jackd.exe"; DestDir: "{app}";
-Source: "win64\lib\libjacknet64.dll"; DestDir: "{app}";
-Source: "win64\lib\libjackserver64.dll"; DestDir: "{app}";
+Source: "win64\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
+Source: "win64\lib\libjacknet64.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
+Source: "win64\lib\libjackserver64.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion;
; drivers
-Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack";
+Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; Flags: ignoreversion;
; tools
-Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools";
+Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; Flags: ignoreversion;
; jack client lib (NOTE goes into windir)
-Source: "win64\lib\libjack64.dll"; DestDir: "{win}";
-Source: "win64\lib32\libjack.dll"; DestDir: "{win}";
+Source: "win64\lib\libjack64.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion;
+Source: "win64\lib32\libjack.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion;
; qjackctl
-Source: "win64\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl;
-Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl;
-Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl;
+Source: "win64\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion;
+Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion;
+Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; Flags: ignoreversion;
; dev
-Source: "win64\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev;
-Source: "win64\lib\*.a"; DestDir: "{app}\lib"; Components: dev;
-Source: "win64\lib\*.def"; DestDir: "{app}\lib"; Components: dev;
-Source: "win64\lib\*.lib"; DestDir: "{app}\lib"; Components: dev;
-Source: "win64\lib32\*.a"; DestDir: "{app}\lib32"; Components: dev;
-Source: "win64\lib32\*.def"; DestDir: "{app}\lib32"; Components: dev;
-Source: "win64\lib32\*.lib"; DestDir: "{app}\lib32"; Components: dev;
-Source: "win64\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev;
+Source: "win64\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib\*.a"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib\*.def"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib32\*.a"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib32\*.def"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib32\*.lib"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion;
+Source: "win64\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; Flags: ignoreversion;
+; router
+Source: "win64\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; Flags: ignoreversion;
+Source: "win64\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion regserver 32bit;
+Source: "win64\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion;
+Source: "win64\jack-router\win64\JackRouter.dll"; DestDir: "{app}\jack-router\win64"; Components: router; Flags: ignoreversion regserver 64bit;
+Source: "win64\jack-router\win64\JackRouter.ini"; DestDir: "{app}\jack-router\win64"; Components: router; Flags: ignoreversion;
[Icons]
-Name: "{commonprograms}\QJackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
+Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
[Registry]
-Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "Location"; ValueData: "{app}\jackd.exe"
+Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "ServerExecutable"; ValueData: "{app}\jackd.exe"
+Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "Version"; ValueData: "{#VERSION}"
+; 32bit compat keys
+Root: HKLM; Subkey: "Software\WOW6432Node\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "ServerExecutable"; ValueData: "{app}\jackd.exe"
+Root: HKLM; Subkey: "Software\WOW6432Node\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
+Root: HKLM; Subkey: "Software\WOW6432Node\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "Version"; ValueData: "{#VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/windows/portaudio/JackPortAudioAdapter.cpp new/jack2-1.9.17/windows/portaudio/JackPortAudioAdapter.cpp
--- old/jack2-1.9.16/windows/portaudio/JackPortAudioAdapter.cpp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/windows/portaudio/JackPortAudioAdapter.cpp 2021-01-15 16:00:40.000000000 +0100
@@ -211,8 +211,8 @@
desc = jack_driver_descriptor_construct("audioadapter", JackDriverNone, "netjack audio <==> net backend adapter", &filler);
value.ui = 0;
- jack_driver_descriptor_add_parameter(desc, &filler, "in-channels", 'i', JackDriverParamInt, &value, NULL, "Maximum number of input channels", NULL);
- jack_driver_descriptor_add_parameter(desc, &filler, "out-channels", 'o', JackDriverParamInt, &value, NULL, "Maximum number of output channels", NULL);
+ jack_driver_descriptor_add_parameter(desc, &filler, "in-channels", 'i', JackDriverParamUInt, &value, NULL, "Maximum number of input channels", NULL);
+ jack_driver_descriptor_add_parameter(desc, &filler, "out-channels", 'o', JackDriverParamUInt, &value, NULL, "Maximum number of output channels", NULL);
jack_driver_descriptor_add_parameter(desc, &filler, "capture", 'C', JackDriverParamString, &value, NULL, "Provide capture ports. Optionally set PortAudio device name", NULL);
@@ -230,10 +230,10 @@
jack_driver_descriptor_add_parameter(desc, &filler, "list-devices", 'l', JackDriverParamBool, &value, NULL, "Display available PortAudio devices", NULL);
value.ui = 0;
- jack_driver_descriptor_add_parameter(desc, &filler, "quality", 'q', JackDriverParamInt, &value, NULL, "Resample algorithm quality (0 - 4)", NULL);
+ jack_driver_descriptor_add_parameter(desc, &filler, "quality", 'q', JackDriverParamUInt, &value, NULL, "Resample algorithm quality (0 - 4)", NULL);
value.ui = 32768;
- jack_driver_descriptor_add_parameter(desc, &filler, "ring-buffer", 'g', JackDriverParamInt, &value, NULL, "Fixed ringbuffer size", "Fixed ringbuffer size (if not set => automatic adaptative)");
+ jack_driver_descriptor_add_parameter(desc, &filler, "ring-buffer", 'g', JackDriverParamUInt, &value, NULL, "Fixed ringbuffer size", "Fixed ringbuffer size (if not set => automatic adaptative)");
return desc;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/windows/portaudio/JackPortAudioDriver.cpp new/jack2-1.9.17/windows/portaudio/JackPortAudioDriver.cpp
--- old/jack2-1.9.16/windows/portaudio/JackPortAudioDriver.cpp 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/windows/portaudio/JackPortAudioDriver.cpp 2021-01-15 16:00:40.000000000 +0100
@@ -334,10 +334,6 @@
goto error;
}
- // It seems that some ASIO drivers (like ASIO4All) needs this to restart correctly;
- delete fPaDevices;
- fPaDevices = new PortAudioDevices();
-
err = OpenStream(buffer_size);
if (err != paNoError) {
jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jack2-1.9.16/wscript new/jack2-1.9.17/wscript
--- old/jack2-1.9.16/wscript 2020-10-16 21:10:40.000000000 +0200
+++ new/jack2-1.9.17/wscript 2021-01-15 16:00:40.000000000 +0100
@@ -11,7 +11,7 @@
from waflib import Logs, Options, Task, Utils
from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallContext
-VERSION='1.9.16'
+VERSION='1.9.17'
APPNAME='jack'
JACK_API_VERSION = '0.1.0'
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lv2 for openSUSE:Factory checked in at 2021-02-01 13:24:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lv2 (Old)
and /work/SRC/openSUSE:Factory/.lv2.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lv2"
Mon Feb 1 13:24:32 2021 rev:18 rq:866444 version:1.18.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/lv2/lv2.changes 2020-12-03 18:37:31.093617649 +0100
+++ /work/SRC/openSUSE:Factory/.lv2.new.28504/lv2.changes 2021-02-01 13:24:33.445761644 +0100
@@ -1,0 +2,8 @@
+Sun Jan 24 17:54:25 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.18.2:
+ * Various code cleanups and infrastructure improvements.
+ * eg-sampler: Save and restore gain parameter value.
+ * state: Fix state:StateChanged URI in metadata and documentation.
+
+-------------------------------------------------------------------
Old:
----
lv2-1.18.0.tar.bz2
New:
----
lv2-1.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lv2.spec ++++++
--- /var/tmp/diff_new_pack.nsfOzH/_old 2021-02-01 13:24:34.177762793 +0100
+++ /var/tmp/diff_new_pack.nsfOzH/_new 2021-02-01 13:24:34.181762799 +0100
@@ -1,7 +1,7 @@
#
# spec file for package lv2
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,19 +23,20 @@
%else
%define _waf python2 waf
%endif
-
Name: lv2
-Version: 1.18.0
+Version: 1.18.2
Release: 0
Summary: Plugin standard for audio systems
License: ISC
Group: System/Libraries
-URL: http://lv2plug.in/
-Source0: http://lv2plug.in/spec/lv2-%{version}.tar.bz2
+URL: https://lv2plug.in/
+Source0: https://lv2plug.in/spec/lv2-%{version}.tar.bz2
Source1: lv2-rpmlintrc
# Patch-Fix-Upstream lv2pkgconfig.patch davejplater(a)gmail.com -- Add "/" to end of -I directory because otherwise pkg-config outputs nothing.
Patch0: lv2pkgconfig.patch
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0
+BuildRequires: pkgconfig(sndfile) >= 1.0.0
%if 0%{?suse_version} > 1500
BuildRequires: python3-Markdown
BuildRequires: python3-rdflib
@@ -43,8 +44,6 @@
BuildRequires: python-Markdown
BuildRequires: python-rdflib
%endif
-BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0
-BuildRequires: pkgconfig(sndfile) >= 1.0.0
%if %{asciidocs} == 1
# Documentation build requirements.
BuildRequires: asciidoc
@@ -182,12 +181,12 @@
%build
%if 0%{?suse_version} > 1500
-for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
+for i in `grep -rl "%{_bindir}/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
%endif
export CFLAGS='%{optflags}'
export CXXFLAGS='%{optflags}'
-%_waf configure -v \
+%{_waf} configure -v \
--prefix=%{_prefix} \
--lv2dir=%{_libdir}/%{name} \
--libdir=%{_libdir} \
@@ -197,10 +196,10 @@
%endif
--debug
-%_waf %{?_smp_mflags} -vvv build
+%{_waf} %{?_smp_mflags} -vvv build
%install
-%_waf install --lv2dir=%{_libdir}/%{name} --destdir=%{buildroot}
+%{_waf} install --lv2dir=%{_libdir}/%{name} --destdir=%{buildroot}
%files
%defattr(0644,root,root,0755)
++++++ lv2-1.18.0.tar.bz2 -> lv2-1.18.2.tar.bz2 ++++++
++++ 18021 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freetds for openSUSE:Factory checked in at 2021-02-01 13:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freetds (Old)
and /work/SRC/openSUSE:Factory/.freetds.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetds"
Mon Feb 1 13:24:29 2021 rev:31 rq:866420 version:1.2.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/freetds/freetds.changes 2020-05-16 22:26:33.937301604 +0200
+++ /work/SRC/openSUSE:Factory/.freetds.new.28504/freetds.changes 2021-02-01 13:24:32.229759737 +0100
@@ -1,0 +2,47 @@
+Sun Jan 24 18:53:45 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.2.18:
+- Sybase server:
+ - All strings are now converted as MSSQL;
+ - Support kerberos login;
+ - DB-Library: add DBSETNETWORKAUTH, DBSETMUTUALAUTH, DBSETDELEGATION and
+ DBSETSERVERPRINCIPAL;
+ - CT-Library: add CS_SEC_NETWORKAUTH, CS_SEC_NETWORKAUTH,
+ CS_SEC_NETWORKAUTH and CS_SEC_NETWORKAUTH;
+- Bulk copies:
+ - DB-Library: fix trim of unicode fields;
+ - Apply character conversion for Sybase, like MSSQL;
+ - Ignore computed columns;
+ - Properly support multibyte strings in column names;
+ - DB-Library: stop correctly on BCPMAXERRS setting;
+ - DB-Library: do not try to convert skipped rows reading file allowing
+ for instance to load CVS files;
+- CT-Library: added CS_DATABASE property to allows to connect correctly
+ to Azure servers;
+- Improve support for MS XML columns for both DB-Library and CT-Library;
+- Fix some issues with MSSQL server redirection (used for instance in
+ Azure);
+- Change SQL_DESC_OCTET_LENGTH value for wise character columns;
+- Better support for SQL_VARIANT:
+ - Better column checks;
+ - CT-Library: now supported, columns are returned as CS_CHAR_TYPE;
+- Some updates to server part:
+ - Set correctly initial state;
+ - IPv6 support;
+ - Fix TDS 7.2 logins;
+- Support extended character using domain logins under Unix;
+- Improve MARS:
+ - Less memory copies;
+ - Remove possible deadlock;
+ - Handle wrapping sequence/window numbers;
+ - Make sure we sent the wanted packet;
+- Support UTF-16 surrogate pairs in odbc_wide2utf and odbc_set_string_flag
+ fixing some character encoding support;
+- Fix multiple queries, used by ODBC to optimize data load;
+- Improve emulated parameter queries, fixing minor issues and reducing
+ memory usage;
+- Support DBVERSION_UNKNOWN in dbsetlversion (will use automatic detection);
+- CT-Library: define CS_MIN_SYBTYPE and CS_MAX_SYBTYPE;
+- CT-Library: fix cs_will_convert accepting library constants, not libTDS.
+
+-------------------------------------------------------------------
Old:
----
freetds-1.1.36.tar.bz2
New:
----
freetds-1.2.18.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freetds.spec ++++++
--- /var/tmp/diff_new_pack.zlviXo/_old 2021-02-01 13:24:32.913760810 +0100
+++ /var/tmp/diff_new_pack.zlviXo/_new 2021-02-01 13:24:32.917760817 +0100
@@ -1,7 +1,7 @@
#
# spec file for package freetds
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
Name: freetds
-Version: 1.1.36
+Version: 1.2.18
Release: 0
Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol
License: LGPL-2.1-or-later AND GPL-2.0-or-later
URL: https://www.freetds.org/
-Source: ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.bz2
+Source: https://www.freetds.org/files/stable/freetds-1.2.18.tar.gz
Patch0: configure-return-void-fix.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -144,7 +144,6 @@
install -d %{buildroot}%{_docdir}/freetds
mv %{buildroot}%{_datadir}/doc/freetds/* %{buildroot}%{_docdir}/freetds/
rm -rf %{buildroot}%{_docdir}/freetds* %{buildroot}%{_datadir}/doc/freetds-*
-install -D AUTHORS %{buildroot}%{_defaultdocdir}/%{name}/AUTHORS
# Fix permissions
find %{buildroot}%{_datadir} -type f -print0 | xargs -0 chmod -x
find %{buildroot}%{_sysconfdir} -type f -print0 | xargs -0 chmod -x
@@ -180,7 +179,6 @@
%{_mandir}/man1/*.1%{?ext_man}
%files devel
-%doc BUGS NEWS README TODO
%{_libdir}/*.so
%{_includedir}/*
@@ -197,6 +195,6 @@
%{_libdir}/libtdsodbc.so.*
%files doc
-%{_defaultdocdir}/freetds/
+%doc AUTHORS.md BUGS.md NEWS.md README.md TODO.md
%changelog
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package memtest86+ for openSUSE:Factory checked in at 2021-02-01 13:24:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/memtest86+ (Old)
and /work/SRC/openSUSE:Factory/.memtest86+.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "memtest86+"
Mon Feb 1 13:24:28 2021 rev:35 rq:866366 version:5.31b
Changes:
--------
--- /work/SRC/openSUSE:Factory/memtest86+/memtest86+.changes 2020-04-15 19:53:28.061571202 +0200
+++ /work/SRC/openSUSE:Factory/.memtest86+.new.28504/memtest86+.changes 2021-02-01 13:24:29.877756048 +0100
@@ -1,0 +2,28 @@
+Sun Jan 17 13:48:44 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 5.31b:
+ * Added support for up to 2 TB of RAM on X64 CPUs
+ * Added experimental SMT support up to 32 cores (Press F2 to enable at startup)
+ * Added complete detection for memory controllers
+ * Added Motherboard Manufacturer & Model reporting
+ * Added CPU temperature reporting
+ * Added enhanced Fail Safe Mode (Press F1 at startup)
+ * Added support for Intel "Sandy Bridge-E" CPUs
+ * Added support for Intel "Ivy Bridge" CPUs
+ * Added preliminary support for Intel "Haswell" CPUs (Core 4th Gen)
+ * Added preliminary support for Intel "Haswell-ULT" CPUs
+ * Added support for AMD "Kabini" (K16) CPUs
+ * Added support for AMD "Bulldozer" CPUs
+ * Added support for AMD "Trinity" CPUs
+ * Added support for AMD E-/C-/G-/Z- "Bobcat" CPUs
+ * Added support for Intel Atom "Pineview" CPUs
+ * Added support for Intel Atom "Cedar Trail" CPUs
+ * Added SPD detection on most AMD Chipsets
+ * Enforced Coreboot support
+ * Optimized run time for faster memory error detection
+ * Rewriten lots of memory timings detection cod
+ * Corrected bugs, bugs and more bugs (some could remain)
+- drop memtest86+-5.01-array-size-fix.patch, memtest86+-5.01-compile-fix.patch
+ memtest86+-gcc5.patch: upstream
+
+-------------------------------------------------------------------
Old:
----
memtest86+-5.01-array-size-fix.patch
memtest86+-5.01-compile-fix.patch
memtest86+-5.01.tar.gz
memtest86+-gcc5.patch
New:
----
memtest86+-5.31b.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ memtest86+.spec ++++++
--- /var/tmp/diff_new_pack.tUJUu0/_old 2021-02-01 13:24:31.205758131 +0100
+++ /var/tmp/diff_new_pack.tUJUu0/_new 2021-02-01 13:24:31.209758137 +0100
@@ -1,7 +1,7 @@
#
# spec file for package memtest86+
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,15 @@
Name: memtest86+
-Version: 5.01
+Version: 5.31b
Release: 0
Summary: Memory Testing Image for x86 Architecture
License: BSD-3-Clause
Group: System/Boot
-URL: http://www.memtest.org
-Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+URL: https://www.memtest.org
+Source: https://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz
Patch0: fix-destdir
Patch1: memtest86+-5.01-no-optimization.patch
-Patch2: memtest86+-5.01-compile-fix.patch
-Patch3: memtest86+-5.01-array-size-fix.patch
-Patch4: memtest86+-gcc5.patch
#!BuildIgnore: gcc-PIE
Requires(pre): /sbin/update-bootloader
Requires(pre): perl
@@ -48,9 +45,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
# dependencies are broken for the package and it should not be built in parallel
++++++ fix-destdir ++++++
--- /var/tmp/diff_new_pack.tUJUu0/_old 2021-02-01 13:24:31.237758181 +0100
+++ /var/tmp/diff_new_pack.tUJUu0/_new 2021-02-01 13:24:31.237758181 +0100
@@ -1,5 +1,7 @@
---- memtest86+-5.01/Makefile.old 2013-08-10 04:01:58.000000000 +0200
-+++ memtest86+-5.01/Makefile 2013-11-07 11:48:01.000000000 +0100
+Index: memtest86+-5.31b/Makefile
+===================================================================
+--- memtest86+-5.31b.orig/Makefile
++++ memtest86+-5.31b/Makefile
@@ -8,6 +8,7 @@
# Path for the floppy disk device
#
@@ -8,15 +10,7 @@
AS=as -32
CC=gcc
-@@ -21,7 +22,6 @@ OBJS= head.o reloc.o main.o test.o init.
-
-
- all: clean memtest.bin memtest
-- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
-
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
-@@ -71,7 +71,10 @@ iso:
+@@ -75,7 +76,10 @@ iso:
make all
./makeiso.sh
++++++ memtest86+-5.01-no-optimization.patch ++++++
--- /var/tmp/diff_new_pack.tUJUu0/_old 2021-02-01 13:24:31.245758194 +0100
+++ /var/tmp/diff_new_pack.tUJUu0/_new 2021-02-01 13:24:31.245758194 +0100
@@ -1,11 +1,13 @@
---- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000
-+++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
+Index: memtest86+-5.31b/Makefile
+===================================================================
+--- memtest86+-5.31b.orig/Makefile
++++ memtest86+-5.31b/Makefile
+@@ -13,7 +13,7 @@ TARGETDIR=/boot
AS=as -32
CC=gcc
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+-CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
++CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+
+ SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
++++++ memtest86+-5.01.tar.gz -> memtest86+-5.31b.tar.gz ++++++
++++ 22988 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ffmpeg-4 for openSUSE:Factory checked in at 2021-02-01 13:24:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old)
and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-4"
Mon Feb 1 13:24:25 2021 rev:36 rq:866363 version:4.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2020-12-03 18:38:16.829704300 +0100
+++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.28504/ffmpeg-4.changes 2021-02-01 13:24:26.909751393 +0100
@@ -1,0 +2,9 @@
+Sun Jan 24 11:22:02 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- remove dependency on OpenJPEG, this is obsolete since ffmpeg 4.0,
+ we already build against OpenJPEG 2.1.
+ see changes:
+ - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now
+ requires 2.1 (or later) and pkg-config.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpeg-4.spec ++++++
--- /var/tmp/diff_new_pack.f0SUTZ/_old 2021-02-01 13:24:27.693752622 +0100
+++ /var/tmp/diff_new_pack.f0SUTZ/_new 2021-02-01 13:24:27.697752628 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ffmpeg-4
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -153,7 +153,6 @@
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libgme)
BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
-BuildRequires: pkgconfig(libopenjpeg)
%if %{with openmpt}
BuildRequires: pkgconfig(libopenmpt)
%endif
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2021-02-01 13:24:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libdrm (Old)
and /work/SRC/openSUSE:Factory/.libdrm.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdrm"
Mon Feb 1 13:24:24 2021 rev:152 rq:866361 version:2.4.104
Changes:
--------
--- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2021-01-08 17:33:20.493158683 +0100
+++ /work/SRC/openSUSE:Factory/.libdrm.new.28504/libdrm.changes 2021-02-01 13:24:25.757749585 +0100
@@ -1,0 +2,17 @@
+Sun Jan 24 11:45:41 UTC 2021 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- reenabled build of manual pages (switch from xsltproc to rst2man)
+
+-------------------------------------------------------------------
+Sun Jan 24 09:45:03 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 2.4.104:
+ * headers: drm: Sync with drm-next
+ * Remove outdated comments about stdint.h
+ * Remove definitions duplicated from drm_mode.h
+ * xf86drmMode.h use ANSI C99 arrays
+ * Document drmModeConnection
+ * man: convert to reSTructuredText
+ * testsuite fixes
+
+-------------------------------------------------------------------
Old:
----
libdrm-2.4.103.tar.xz
New:
----
libdrm-2.4.104.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdrm.spec ++++++
--- /var/tmp/diff_new_pack.5rCrqM/_old 2021-02-01 13:24:26.273750395 +0100
+++ /var/tmp/diff_new_pack.5rCrqM/_new 2021-02-01 13:24:26.277750401 +0100
@@ -17,7 +17,7 @@
Name: libdrm
-Version: 2.4.103
+Version: 2.4.104
Release: 0
Summary: Userspace Interface for Kernel DRM Services
License: MIT
@@ -29,12 +29,11 @@
Source: https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
Source2: baselibs.conf
-# Required for building manpages
-BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: meson >= 0.43
BuildRequires: pkgconfig
-BuildRequires: xsltproc
+# needed for rst2man to create manual pages
+BuildRequires: python3-docutils
BuildRequires: pkgconfig(pciaccess) >= 0.10
%if 0%{?with_valgrind_support:1}
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm}
++++++ libdrm-2.4.103.tar.xz -> libdrm-2.4.104.tar.xz ++++++
++++ 3436 lines of diff (skipped)
1
0