Architecture specific change in rpms/podman.git
by githook-noreply＠fedoraproject.org
The package rpms/podman.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/podman.git/commit/?id=6a4295016f0....
Change:
+%ifarch %{ix86} armv7hl
Thanks.
Full change:
============
commit 6a4295016f004564e5fb41389871449d0143a109
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Mar 23 21:41:07 2021 -0400
fix build issues on 32-bit
(cherry picked from commit 1e1651a3ef847ee58221162ea79ce8c45a397fd2)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/podman.spec b/podman.spec
index 8fb4538..1d4d8dd 100644
--- a/podman.spec
+++ b/podman.spec
@@ -452,7 +452,9 @@ file. Each CNI network will have its own dnsmasq instance.
%prep
%autosetup -Sgit -n %{name}-%{built_tag_strip}
-#rm -f docs/source/markdown/containers-mounts.conf.5.md
+%ifarch %{ix86} armv7hl
+sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
+%endif
# untar dnsname
tar zxf %{SOURCE1}
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/podman.git
by githook-noreply＠fedoraproject.org
The package rpms/podman.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/podman.git/commit/?id=1e1651a3ef8....
Change:
+%ifarch %{ix86} armv7hl
Thanks.
Full change:
============
commit 1e1651a3ef847ee58221162ea79ce8c45a397fd2
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Mar 23 21:41:07 2021 -0400
fix build issues on 32-bit
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/podman.spec b/podman.spec
index 30bac02..b008fc0 100644
--- a/podman.spec
+++ b/podman.spec
@@ -411,6 +411,9 @@ file. Each CNI network will have its own dnsmasq instance.
%prep
%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%ifarch %{ix86} armv7hl
+sed -i 's/id128StringMax := C.ulong/id128StringMax := C.uint/' vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go
+%endif
# untar dnsname
tar zxf %{SOURCE1}
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/bigloo.git
by githook-noreply＠fedoraproject.org
The package rpms/bigloo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bigloo.git/commit/?id=1d050dcc419....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 1d050dcc41988cabd022d378ec0870e89512d77f
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Mar 23 13:59:33 2021 -0600
Disable tests on s390x until a Java mutex problem can be diagnosed.
diff --git a/bigloo.spec b/bigloo.spec
index 302729a..15a29d3 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -287,10 +287,15 @@ cat > %{buildroot}%{_xemacs_sitestartdir}/bigloo.el <<EOF
EOF
+# FIXME: there is some kind of problem on s390x involving Java mutexes.
+# It almost looks like they are nonatomic. Disable s390x tests until we
+# can diagnose the problem.
+%ifnarch s390x
%check
ulimit -s unlimited
export TZ=$(date +%%Z)
make test
+%endif
%files
@@ -322,6 +327,7 @@ make test
- Version 4.4b
- Drop $date-is-gmt workaround
- Add -div-by-zero patch to work around test failures
+- Disable tests on s390x until a Java mutex problem can be diagnosed
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit aee88983e90983559db7c27b4a53b146df5d34d8
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Mar 22 18:46:09 2021 -0600
Add -div-by-zero patch to work around test failures.
diff --git a/bigloo-div-by-zero.patch b/bigloo-div-by-zero.patch
new file mode 100644
index 0000000..7cea43b
--- /dev/null
+++ b/bigloo-div-by-zero.patch
@@ -0,0 +1,17 @@
+--- recette/error.scm.orig 2021-03-22 11:57:58.000000000 -0600
++++ recette/error.scm 2021-03-22 18:44:15.398794536 -0600
+@@ -307,14 +307,6 @@
+ (loop (-fx i 1)))
+ i))
+ 0)
+- (test "with-handler.11"
+- (cons
+- (bind-exit (exit)
+- (with-handler (lambda (e) (exit 'a))
+- (/fx 1 0)))
+- (with-handler (lambda (e) 'b)
+- (/fx 1 0)))
+- '(a . b))
+ (test "with-handler.1-eval"
+ (eval '(with-handler
+ (lambda (e) e)
diff --git a/bigloo.spec b/bigloo.spec
index 73359c6..302729a 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -50,6 +50,10 @@ Patch7: %{name}-javac.patch
Patch8: %{name}-return.patch
# Fix signal numbers in the Java code
Patch9: %{name}-java-signum.patch
+# GCC can sometimes replace the entire test with direct failure due to
+# detecting division by zero. Skip this test until we can figure out how
+# make GCC be a little less clever.
+Patch10: %{name}-div-by-zero.patch
BuildRequires: emacs
BuildRequires: xemacs
@@ -317,6 +321,7 @@ make test
* Fri Feb 5 2021 Jerry James <loganjerry(a)gmail.com> - 4.4b-1
- Version 4.4b
- Drop $date-is-gmt workaround
+- Add -div-by-zero patch to work around test failures
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 4e1cbad99375a1a51e0f683eee0741a5b12d9eee
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Mar 22 14:25:03 2021 -0600
Version 4.4b. Drop $date-is-gmt workaround.
diff --git a/bigloo-java-signum.patch b/bigloo-java-signum.patch
index 3905380..5d34343 100644
--- a/bigloo-java-signum.patch
+++ b/bigloo-java-signum.patch
@@ -1,21 +1,9 @@
---- runtime/Jlib/foreign.java.orig 2020-11-17 08:34:27.658967218 -0700
-+++ runtime/Jlib/foreign.java 2020-11-17 08:37:47.902577663 -0700
-@@ -5582,21 +5582,36 @@ public final class foreign
- //////
- public static final int PTR_ALIGNMENT = 2;
- public static final int SIGHUP = 1;
-- public static final int SIGQUIT = 2;
-- public static final int SIGINT = 3;
-+ public static final int SIGINT = 2;
-+ public static final int SIGQUIT = 3;
- public static final int SIGILL = 4;
- public static final int SIGTRAP = 5;
- public static final int SIGABRT = 6;
-- public static final int SIGKILL = 9;
-- public static final int SIGFPE = 8;
+--- runtime/Jlib/foreign.java.orig 2021-03-22 13:41:14.652144132 -0600
++++ runtime/Jlib/foreign.java 2021-03-22 13:46:10.822676017 -0600
+@@ -5597,13 +5597,28 @@ public final class foreign
public static final int SIGBUS = 7;
-+ public static final int SIGFPE = 8;
-+ public static final int SIGKILL = 9;
+ public static final int SIGFPE = 8;
+ public static final int SIGKILL = 9;
+ public static final int SIGUSR1 = 10;
public static final int SIGSEGV = 11;
+ public static final int SIGUSR2 = 12;
diff --git a/bigloo-javac.patch b/bigloo-javac.patch
index 5220f65..a1d9ef9 100644
--- a/bigloo-javac.patch
+++ b/bigloo-javac.patch
@@ -1,89 +1,29 @@
---- api/pthread/src/Java/bglpthread.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/pthread/src/Java/bglpthread.java 2021-01-24 10:19:30.017962237 -0700
-@@ -123,7 +123,7 @@ public class bglpthread extends Thread {
-
- // Yield the processor
- public static int sched_yield() {
-- yield();
-+ Thread.yield();
- return 0;
- }
-
---- api/srfi18/src/Java/jthread.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/srfi18/src/Java/jthread.java 2021-01-24 10:19:59.402882259 -0700
-@@ -123,7 +123,7 @@ public class jthread extends Thread {
-
- // Yield the processor
- public static int sched_yield() {
-- yield();
-+ Thread.yield();
- return 0;
- }
-
---- api/ssl/src/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ api/ssl/src/Makefile 2021-01-24 10:21:22.369671180 -0700
-@@ -90,24 +90,44 @@ INCLUDES = $(C_SRC_DIR)/bglssl.h $(C_SRC
+--- api/ssl/src/Makefile.orig 2021-03-22 11:57:58.000000000 -0600
++++ api/ssl/src/Makefile 2021-03-22 13:27:37.299383342 -0600
+@@ -192,19 +192,8 @@ jvm-extra: $(JAVA_CLASSES_SRC) $(BOOTLIB
#*---------------------------------------------------------------------*/
- #* Java objects */
+ #* Java auconfiguration */
#*---------------------------------------------------------------------*/
-+ifeq ($(JAVA_VERSION), 14)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 13)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 12)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 11)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 10)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
- ifeq ($(JAVA_VERSION), 1.9)
- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
- else
-- ifeq ($(JAVA_VERSION), 1.8)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+-ifeq ($(JAVA_VERSION), 1.7)
+- JDK=15
+-else
+- ifeq ($(JAVA_VERSION), 1.6)
+- JDK=15
+- else
+- ifeq ($(JAVA_VERSION), 1.5)
+- JDK=15
- else
-- ifeq ($(JAVA_VERSION), 1.7)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- else
-- ifeq ($(JAVA_VERSION), 1.6)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- else
-- ifeq ($(JAVA_VERSION), 1.5)
-- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-- endif
-- endif
-- endif
+- JDK=13
- endif
-+ifeq ($(JAVA_VERSION), 1.8)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.7)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.6)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+else
-+ifeq ($(JAVA_VERSION), 1.5)
-+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
- endif
+- endif
+-endif
++
++JDK=15
- #*---------------------------------------------------------------------*/
---- bde/jas/produce.scm.orig 2020-11-09 00:07:31.000000000 -0700
-+++ bde/jas/produce.scm 2021-01-24 10:18:58.958050998 -0700
+ $(JAVA_SRC_DIR)/ssl_client_socket.java: \
+ $(JAVA_SRC_DIR)/ssl_client_socket$(JDK).java
+--- bde/jas/produce.scm.orig 2021-03-22 11:59:17.000000000 -0600
++++ bde/jas/produce.scm 2021-03-22 13:27:37.300383341 -0600
@@ -24,8 +24,8 @@
fields methods attributes )
(outshort outchan #xCAFE)
@@ -95,8 +35,8 @@
(produce-pool outchan pool-size (reverse pool))
(outshort outchan flags)
(outshort outchan me)
---- comptime/Jas/produce.scm.orig 2020-11-09 00:06:14.000000000 -0700
-+++ comptime/Jas/produce.scm 2021-01-24 10:18:58.959050996 -0700
+--- comptime/Jas/produce.scm.orig 2021-03-22 11:57:58.000000000 -0600
++++ comptime/Jas/produce.scm 2021-03-22 13:27:37.300383341 -0600
@@ -24,8 +24,8 @@
fields methods attributes )
(outshort outchan #xCAFE)
@@ -108,19 +48,8 @@
(produce-pool outchan pool-size (reverse pool))
(outshort outchan flags)
(outshort outchan me)
---- comptime/SawJvm/out.scm.orig 2020-11-09 00:06:14.000000000 -0700
-+++ comptime/SawJvm/out.scm 2021-01-24 10:21:57.449582777 -0700
-@@ -473,7 +473,7 @@
- (define (localvar me::jvm r b e id);
- (with-access::rtl_reg r (type var)
- (when (and (local? var) (local-user? var))
-- (let ( (user-name (symbol->string (local-id var)))
-+ (let ( (user-name (bigloo-mangle (symbol->string (local-id var))))
- (type (compile-type me type)) )
- (code! me `(localvar ,b ,e ,user-name ,type ,id)) ))))
-
---- configure.orig 2020-11-09 00:06:14.000000000 -0700
-+++ configure 2021-01-24 10:23:54.802287045 -0700
+--- configure.orig 2021-03-22 11:57:58.000000000 -0600
++++ configure 2021-03-22 13:27:39.036380709 -0600
@@ -109,7 +109,7 @@ zip=zip
jar="jar cmf"
zflags=
@@ -130,7 +59,7 @@
java=java
jflags=
jvflags=-noverify
-@@ -3255,7 +3255,7 @@ if [ $action = "all" -o $action = "biglo
+@@ -3256,7 +3256,7 @@ if [ $action = "all" -o $action = "biglo
--jflags=$jflags \
--jvflags=$jvflags \
--javac=$javac \
@@ -139,26 +68,7 @@
--cpsep="$cpsep"` || exit 1
if [ $jtest != 0 ]; then
-@@ -3266,7 +3266,17 @@ if [ $action = "all" -o $action = "biglo
- fi
-
- java_version=`$javac -version 2>&1 | head -n 1` || exit 1
-- if $echo "$java_version" | grep "1.9" > /dev/null
-+ if $echo "$java_version" | grep "14." > /dev/null
-+ then java_version=14
-+ elif $echo "$java_version" | grep "13." > /dev/null
-+ then java_version=13
-+ elif $echo "$java_version" | grep "12." > /dev/null
-+ then java_version=12
-+ elif $echo "$java_version" | grep "11." > /dev/null
-+ then java_version=11
-+ elif $echo "$java_version" | grep "10." > /dev/null
-+ then java_version=10
-+ elif $echo "$java_version" | grep "1.9" > /dev/null
- then java_version=1.9
- elif $echo "$java_version" | grep "1.8" > /dev/null
- then java_version=1.8
-@@ -4624,7 +4634,7 @@ if [ $action = "all" -o $action = "Makef
+@@ -4636,7 +4636,7 @@ if [ $action = "all" -o $action = "Makef
if [ "$java_configured" = "no" ]; then
$autoconfdir/javatest --java=$java --jflags=$jflags --jvflags=$jvflags \
@@ -167,8 +77,8 @@
if [ $? != 0 ]; then
$echo "*** ERROR:configure:Can't configure JVM back-end"
---- jigloo/jigloo.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ jigloo/jigloo.java 2021-01-24 10:18:58.961050990 -0700
+--- jigloo/jigloo.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ jigloo/jigloo.java 2021-03-22 13:27:39.037380707 -0600
@@ -21,7 +21,7 @@ public abstract class jigloo {
static PrintStream out = System.out;
static int verbose = 0;
@@ -217,16 +127,16 @@
}
---- jigloo/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ jigloo/Makefile 2021-01-24 10:18:58.961050990 -0700
+--- jigloo/Makefile.orig 2021-03-22 11:57:58.000000000 -0600
++++ jigloo/Makefile 2021-03-22 13:27:39.038380706 -0600
@@ -133,4 +133,4 @@ pop:
#* .java --> .class */
#*---------------------------------------------------------------------*/
.java.class:
- @ $(JAVAC) $*.java
+ @ $(JAVAC) $(JCFLAGS) $*.java
---- runtime/Jlib/cnst.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/cnst.java 2021-01-24 10:18:58.962050987 -0700
+--- runtime/Jlib/cnst.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/cnst.java 2021-03-22 13:27:39.038380706 -0600
@@ -6,7 +6,7 @@ public class cnst extends obj
{
public final int value;
@@ -251,47 +161,8 @@
final cnst result = new cnst( value );
---- runtime/Jlib/date.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/date.java 2021-01-24 10:26:33.417887275 -0700
-@@ -21,7 +21,7 @@ public class date extends obj {
- if( !istz ) {
- calendar = new GregorianCalendar( y, mon, d, h, min, s );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset(calendar.getTimeInMillis()) / 1000;
- } else {
- final TimeZone tmz = new SimpleTimeZone( 0, "UTC" );
- calendar = new GregorianCalendar( tmz );
-@@ -35,21 +35,21 @@ public class date extends obj {
- public date( final long seconds ) {
- calendar = new GregorianCalendar();
- final Date d = new Date();
--
-- d.setTime( seconds * 1000 );
-+ final long milliseconds = seconds * 1000;
-+ d.setTime( milliseconds );
- calendar.setTime( d );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset( milliseconds ) / 1000;
- }
-
- public date( final long nseconds, boolean _b ) {
- calendar = new GregorianCalendar();
- final Date d = new Date();
--
-- d.setTime( nseconds / _b ? 1000000 : 1000 );
-+ final long milliseconds = nseconds / 1000000;
-+ d.setTime( milliseconds );
- calendar.setTime( d );
- final TimeZone tmz = calendar.getTimeZone();
-- timezone = -tmz.getRawOffset() / 1000;
-+ timezone = tmz.getOffset( milliseconds ) / 1000;
- nsec = _b ? (nseconds % 1000000) : (nseconds % 1000);
- }
- }
---- runtime/Jlib/dlopen.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/dlopen.java 2021-01-24 10:18:58.962050987 -0700
+--- runtime/Jlib/dlopen.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/dlopen.java 2021-03-22 13:27:39.970379293 -0600
@@ -22,7 +22,7 @@ import java.lang.reflect.*;
public abstract class dlopen {
private static final String NO_ERROR_YET = "No error (yet)";
@@ -310,41 +181,9 @@
return res;
} else {
return foreign.BUNSPEC;
---- runtime/Jlib/foreign.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/foreign.java 2021-01-24 11:44:12.623838942 -0700
-@@ -3537,17 +3537,17 @@ public final class foreign
- return new bigloo.date(ns, s, min, h, d, mon - 1, y, tz, istz, dst);
- }
-
-- public static date bgl_update_date(date, long ns, int s,
-+ public static date bgl_update_date(date dt, long ns, int s,
- int min, int h, int d, int mon,
- int y, int tz, boolean istz, int dst)
- {
- date tmp = bgl_make_date( ns, s, min, h, d, mon,
- y, tz, istz, dst);
-
-- date.nsec = tmp.nsec;
-- date.calendar = tmp.calendar;
-- date.timezone = tmp.timezone;
-- return date;
-+ dt.nsec = tmp.nsec;
-+ dt.calendar = tmp.calendar;
-+ dt.timezone = tmp.timezone;
-+ return dt;
- }
-
-
-@@ -3579,7 +3579,7 @@ public final class foreign
- return d;
- }
-
-- public static date bgl_milliseconds_to_date(long sec)
-+ public static date bgl_milliseconds_to_utc_date(long sec)
- {
- date d = new bigloo.date(sec * 1000000, true);
- d.calendar.setTimeZone(new SimpleTimeZone(0, "UTC"));
-@@ -5088,7 +5088,7 @@ public final class foreign
+--- runtime/Jlib/foreign.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/foreign.java 2021-03-22 13:41:14.652144132 -0600
+@@ -5095,7 +5095,7 @@ public final class foreign
throw v;
}
@@ -353,8 +192,8 @@
public static void notify_exception( Throwable e ) throws Throwable {
if( e instanceof ClassCastException ) {
---- runtime/Jlib/JDK16.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/JDK16.java 2021-01-24 10:18:58.963050984 -0700
+--- runtime/Jlib/JDK16.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/JDK16.java 2021-03-22 13:27:40.891377897 -0600
@@ -19,7 +19,7 @@ import java.lang.reflect.*;
public class JDK16 extends JDK {
@@ -364,8 +203,8 @@
return c.getDeclaredMethod( new String( m ) );
}
---- runtime/Jlib/JDK.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/JDK.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/JDK.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/JDK.java 2021-03-22 13:27:40.892377895 -0600
@@ -49,8 +49,8 @@ public abstract class JDK {
private static JDK getImpl(String classname) {
@@ -395,8 +234,8 @@
throws Exception;
public abstract Object invokeImpl(Method m) throws Exception;
---- runtime/Jlib/output_pipe_port.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/output_pipe_port.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/output_pipe_port.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/output_pipe_port.java 2021-03-22 13:27:40.892377895 -0600
@@ -42,7 +42,7 @@ public class output_pipe_port extends ou
static String[] tokenizer( byte[] s ) {
@@ -415,8 +254,8 @@
}
static String[] make_cmd( byte[] s ) {
---- runtime/Jlib/process.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/process.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/process.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/process.java 2021-03-22 13:27:40.893377894 -0600
@@ -12,6 +12,7 @@ package bigloo;
import java.io.IOException;
@@ -472,8 +311,8 @@
}
catch (InterruptedException _i)
{
---- runtime/Jlib/weakptr.java.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Jlib/weakptr.java 2021-01-24 10:18:58.964050981 -0700
+--- runtime/Jlib/weakptr.java.orig 2021-03-22 11:57:58.000000000 -0600
++++ runtime/Jlib/weakptr.java 2021-03-22 13:27:40.894377892 -0600
@@ -4,10 +4,10 @@ import java.lang.ref.WeakReference;
@@ -496,80 +335,3 @@
}
public void write( final output_port p ) {
---- runtime/Makefile.orig 2020-11-09 00:06:14.000000000 -0700
-+++ runtime/Makefile 2021-01-24 10:28:05.481655201 -0700
-@@ -108,30 +108,51 @@ C_CLIB = $(CLIB:%=Clib/%.c)
- #* Java objects */
- #*---------------------------------------------------------------------*/
- JDK_LIBS = JDK
-+
-+ifeq ($(JAVA_VERSION), 14)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 13)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 12)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 11)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 10)
-+ JDK_LIBS += JDK16
-+else
- ifeq ($(JAVA_VERSION), 1.9)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.8)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.7)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.6)
-- JDK_LIBS += JDK16
-- else
-- ifeq ($(JAVA_VERSION), 1.5)
-- JDK_LIBS += JDK15
-- else
-- ifeq ($(JAVA_VERSION), 1.4)
-- JDK_LIBS += JDK14
-- else
-- JDK_LIBS += JDK13
-- endif
-- endif
-- endif
-- endif
-- endif
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.8)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.7)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.6)
-+ JDK_LIBS += JDK16
-+else
-+ifeq ($(JAVA_VERSION), 1.5)
-+ JDK_LIBS += JDK15
-+else
-+ifeq ($(JAVA_VERSION), 1.4)
-+ JDK_LIBS += JDK14
-+else
-+ JDK_LIBS += JDK13
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
-+endif
- endif
-
- JLIB = foreign buffer configure stackwriter\
diff --git a/bigloo.spec b/bigloo.spec
index e6b81a0..73359c6 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -22,8 +22,8 @@
%global bundledgc 8.0.4
Name: bigloo
-Version: 4.4a
-Release: 2%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
+Version: 4.4b
+Release: 1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
Summary: A compiler for the Scheme programming language
License: GPLv2+
@@ -154,24 +154,11 @@ sed -i 's/^extralibs="-lm -lc"/extralibs="-lgc -lm -lc"/' configure
sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc
%endif
-# Defeat attempts at inserting unnecessary rpaths
-sed -ri 's/ ?-Wl,-rpath=[^"]+(")/\1/' configure
-
# Keep generated files for debuginfo
sed -i 's/fcfa-arithmetic/& -rm/' configure
sed -i 's/no-hello/& -rm/' bdb/bdb/Makefile
sed -i 's/-O2/& -rm/' cigloo/Makefile
-# The 4.4a release omits a Java definition of $date-is-gmt, leading to build
-# failure. Patching date.scm leads to bigloo attempting to regenerate the C
-# files, with bigloo, before the bigloo binary is built, leading to build
-# failure. Instead, we use sed to insert the missing definition, then
-# carefully put the timestamp back the way we found it. We don't want the C
-# files to be regenerated, because this affects Java only.
-sed -i.orig 's/method.*ISDST.*/&\n\t (method static $date-is-gmt::bool (::date) "BGL_DATE_ISGMT")/' runtime/Llib/date.scm
-touch -r runtime/Llib/date.scm.orig runtime/Llib/date.scm
-rm runtime/Llib/date.scm.orig
-
%build
%define inplace $PWD/inplace
@@ -327,6 +314,10 @@ make test
%changelog
+* Fri Feb 5 2021 Jerry James <loganjerry(a)gmail.com> - 4.4b-1
+- Version 4.4b
+- Drop $date-is-gmt workaround
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e280560..c27d097 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bigloo-4.4a.tar.gz) = 7025dfb865a8cef182fb506accf42186df02232a3a94142f7fef5b01ecedbd5e8e48e80abc2dc0bcee215fb2bc961adde5930913ae41d557958f2403c0f9877f
+SHA512 (bigloo-4.4b.tar.gz) = 08b6fcb3cf985f9d24f4e60d32e0aa77a5be234111d19f8cdd3e3fb37989172524ea95d1b0dffb567c1b5d9e4c20dc1ae3c1591581e31cb62d5f5b85c721b381
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/icecat.git
by githook-noreply＠fedoraproject.org
The package rpms/icecat.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=6509dc78d0a...
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=223056b0bfe....
Change:
+ExcludeArch: ppc64le
-ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 6509dc78d0ab2bf0bad756f56513184a467c6503
Author: Antonio Trande <3974791-anto.trande(a)users.noreply.gitlab.com>
Date: Tue Mar 23 18:35:52 2021 +0100
Mozilla Release 78.9.0ESR |Exclude PowerPC64le
diff --git a/icecat.spec b/icecat.spec
index 415d6fb..f610dc5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,3 +1,6 @@
+# Temporarily disabled, filed as rhbz#1932204
+ExcludeArch: ppc64le
+
### Naming ###
# Set to true if it's going to be submitted as update
%global release_build 1
commit 7a130b53cd40f809a553dae64a8faa5e34df793f
Author: Antonio Trande <3974791-anto.trande(a)users.noreply.gitlab.com>
Date: Tue Mar 23 17:19:18 2021 +0100
Mozilla Release 78.9.0ESR
diff --git a/.gitignore b/.gitignore
index a8a02f1..00b8800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,3 +147,5 @@
/icecat-78.7.1-rh1.tar.bz2
/icecat-78.8.0-langpacks.tar.gz
/icecat-78.8.0-rh1.tar.bz2
+/icecat-78.9.0-langpacks.tar.gz
+/icecat-78.9.0-rh1.tar.bz2
diff --git a/icecat-78.7.1-fix_error_template_with_C_linkage.patch b/icecat-78.7.1-fix_error_template_with_C_linkage.patch
deleted file mode 100644
index 43ee5e2..0000000
--- a/icecat-78.7.1-fix_error_template_with_C_linkage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/other-licenses/atk-1.0/atk/atkobject.orig.h 2021-02-05 19:53:35.000000000 +0100
-+++ b/other-licenses/atk-1.0/atk/atkobject.h 2021-02-06 19:29:57.596256493 +0100
-@@ -20,11 +20,12 @@
- #ifndef __ATK_OBJECT_H__
- #define __ATK_OBJECT_H__
-
-+#include <glib-object.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-
--#include <glib-object.h>
- #include <atk/atkstate.h>
- #include <atk/atkrelationtype.h>
-
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1aeeea0..0352d7a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=78.8.0
+VERSION=78.9.0
URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_...
for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index ae7063a..415d6fb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,9 +48,6 @@
%define _lto_cflags %{nil}
####################
-# Temporarily disabled, filed as rhbz#1932204
-#ExcludeArch: ppc64le
-
# Active/Deactive language files handling
%global build_langpacks 1
@@ -112,8 +109,8 @@
%global __requires_exclude_from ^%{icecatappdir}
Name: icecat
-Version: 78.8.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.9.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -181,7 +178,6 @@ Patch55: mozilla-1669442.patch
Patch219: rhbz-1173156.patch
Patch220: firefox-nss-version.patch
Patch221: firefox-nss-addon-hack.patch
-Patch222: %{name}-78.7.1-fix_error_template_with_C_linkage.patch
# ARM run-time patch
Patch226: rhbz-1354671.patch
@@ -395,7 +391,6 @@ tar -xf %{SOURCE5}
%patch219 -p1 -b .rhbz-1173156
#%%patch220 -p1 -b .nss-version
%patch221 -p1 -b .firefox-nss-addon-hack
-%patch222 -p1 -b .fix_error_template_with_C_linkage
# ARM run-time patch
%ifarch aarch64
@@ -877,6 +872,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Tue Mar 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.9.0-1.rh1
+- Mozilla Release 78.9.0ESR
+
* Thu Feb 25 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-3.rh1
- Add Mozilla patch #1692706
diff --git a/sources b/sources
index e4b2413..c1ae927 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
-SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
-SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
+SHA512 (icecat-78.9.0-langpacks.tar.gz) = d8eab56257141bdcb9a653ff2058c69b1b84ae7b2a2ecdb3f7b53ac3cd4d15be77d8e2abb375a07fc166d71c850e9d0524eb07892d121c352f9c726997956ea0
+SHA512 (icecat-78.9.0-rh1.tar.bz2) = 278f6200a4fd73a45701e7ac0d5a159150858a9f1f6a165c8d5f789ea0825be9729f09e943fc5ce4b18a6f39ddf2c902e0d24606894ae9efab860e1853d66b73
SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c
commit 7ca16dae639d14b4a2d63d668ddcf1d3e0ba3efa
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 14:27:59 2021 +0100
Update cbindgen (0.16.0)
diff --git a/sources b/sources
index c07326f..e4b2413 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
+SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
commit 44716e4c48d6d3dac45b942b086e3a1345b84ee4
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 12:03:34 2021 +0100
Fix patch #1692706
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
index 6defdea..b25d5dd 100644
--- a/mozilla-1692706.patch
+++ b/mozilla-1692706.patch
@@ -19,13 +19,14 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
FORMAT_KEYS = {'cache_size', 'cache_max_size'}
-@@ -874,7 +874,8 @@
+@@ -874,7 +874,9 @@
line, self.PRIMARY_CONFIG_DESCRIPTION)
elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
self.secondary_config = self._strip_prefix(
- line, self.SECONDARY_CONFIG_DESCRIPTION)
+ self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
+ "(readonly)",
++ )
else:
for stat_key, stat_description in self.STATS_KEYS:
if line.startswith(stat_description):
commit 223056b0bfef0f51aece2dc93af494686c9fc768
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 11:41:17 2021 +0100
Add Mozilla patch #1692706
diff --git a/icecat.spec b/icecat.spec
index 8199de1..ae7063a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -49,7 +49,7 @@
####################
# Temporarily disabled, filed as rhbz#1932204
-ExcludeArch: ppc64le
+#ExcludeArch: ppc64le
# Active/Deactive language files handling
%global build_langpacks 1
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
Name: icecat
Version: 78.8.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -197,6 +197,8 @@ Patch422: mozilla-1580174-webrtc-popup.patch
Patch423: mozilla-1512162.patch
Patch424: %{name}-mozilla-1669471.patch
+Patch425: mozilla-1692706.patch
+
# PGO/LTO patches
Patch600: %{name}-pgo.patch
Patch602: mozilla-1516803.patch
@@ -409,15 +411,16 @@ tar -xf %{SOURCE5}
%patch402 -p1 -b .1196777
%patch403 -p1 -b .1640567
-%patch423 -p1 -b .mozilla-1596503
-%patch424 -p1 -b .mozilla-1669471
+%patch423 -p1 -b .1596503
+%patch424 -p1 -b .1669471
+%patch425 -p1 -b .1692706
# Wayland specific upstream patches
%patch565 -p1 -b .firefox-pipewire
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch589 -p1 -b .mozilla-1634213
+%patch589 -p1 -b .1634213
%patch54 -p1 -b .1669639
%patch55 -p1 -b .1669442
@@ -874,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Thu Feb 25 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-3.rh1
+- Add Mozilla patch #1692706
+
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-2.rh1
- Exclude Power64 (rhbz#1932204)
- Fix build option for s390x
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
new file mode 100644
index 0000000..6defdea
--- /dev/null
+++ b/mozilla-1692706.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs(a)blueyonder.co.uk>
+# Date 1614236439 0
+# Node ID cc45c336687916a6d1bfed79a80dc8a292b139a5
+# Parent 8024f219bda91c98fcbba16f2bfc6b4833014bfc
+Bug 1692706 - Update ccache stats parser for ccache 4.x. r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D105863
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -842,7 +842,7 @@
+
+ DIRECTORY_DESCRIPTION = "cache directory"
+ PRIMARY_CONFIG_DESCRIPTION = "primary config"
+- SECONDARY_CONFIG_DESCRIPTION = "secondary config (readonly)"
++ SECONDARY_CONFIG_DESCRIPTION = "secondary config"
+ ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
+ FORMAT_KEYS = {'cache_size', 'cache_max_size'}
+
+@@ -874,7 +874,8 @@
+ line, self.PRIMARY_CONFIG_DESCRIPTION)
+ elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
+ self.secondary_config = self._strip_prefix(
+- line, self.SECONDARY_CONFIG_DESCRIPTION)
++ self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
++ "(readonly)",
+ else:
+ for stat_key, stat_description in self.STATS_KEYS:
+ if line.startswith(stat_description):
commit ebc93c5543d22fe08ab561744f84b44da5f38cf0
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Wed Feb 24 12:19:14 2021 +0100
Change some informations
diff --git a/icecat.spec b/icecat.spec
index ea1706c..8199de1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,12 +48,7 @@
%define _lto_cflags %{nil}
####################
-# Exclude ARM builds for rhbz #1658940
-# Exclude s390x for https://pagure.io/koji/issue/1974
-#ExcludeArch: s390x
-
-# PPC64le does not compile on Fedora 33 yet.
-# Temporarily disabled, filed as rhbz#1862012
+# Temporarily disabled, filed as rhbz#1932204
ExcludeArch: ppc64le
# Active/Deactive language files handling
@@ -880,7 +875,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-2.rh1
-- Exclude Power64
+- Exclude Power64 (rhbz#1932204)
- Fix build option for s390x
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-1.rh1
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/icecat.git
by githook-noreply＠fedoraproject.org
The package rpms/icecat.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=6509dc78d0a...
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=223056b0bfe....
Change:
+ExcludeArch: ppc64le
-ExcludeArch: ppc64le
Thanks.
Full change:
============
commit 6509dc78d0ab2bf0bad756f56513184a467c6503
Author: Antonio Trande <3974791-anto.trande(a)users.noreply.gitlab.com>
Date: Tue Mar 23 18:35:52 2021 +0100
Mozilla Release 78.9.0ESR |Exclude PowerPC64le
diff --git a/icecat.spec b/icecat.spec
index 415d6fb..f610dc5 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -1,3 +1,6 @@
+# Temporarily disabled, filed as rhbz#1932204
+ExcludeArch: ppc64le
+
### Naming ###
# Set to true if it's going to be submitted as update
%global release_build 1
commit 7a130b53cd40f809a553dae64a8faa5e34df793f
Author: Antonio Trande <3974791-anto.trande(a)users.noreply.gitlab.com>
Date: Tue Mar 23 17:19:18 2021 +0100
Mozilla Release 78.9.0ESR
diff --git a/.gitignore b/.gitignore
index a8a02f1..00b8800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,3 +147,5 @@
/icecat-78.7.1-rh1.tar.bz2
/icecat-78.8.0-langpacks.tar.gz
/icecat-78.8.0-rh1.tar.bz2
+/icecat-78.9.0-langpacks.tar.gz
+/icecat-78.9.0-rh1.tar.bz2
diff --git a/icecat-78.7.1-fix_error_template_with_C_linkage.patch b/icecat-78.7.1-fix_error_template_with_C_linkage.patch
deleted file mode 100644
index 43ee5e2..0000000
--- a/icecat-78.7.1-fix_error_template_with_C_linkage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/other-licenses/atk-1.0/atk/atkobject.orig.h 2021-02-05 19:53:35.000000000 +0100
-+++ b/other-licenses/atk-1.0/atk/atkobject.h 2021-02-06 19:29:57.596256493 +0100
-@@ -20,11 +20,12 @@
- #ifndef __ATK_OBJECT_H__
- #define __ATK_OBJECT_H__
-
-+#include <glib-object.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-
--#include <glib-object.h>
- #include <atk/atkstate.h>
- #include <atk/atkrelationtype.h>
-
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 1aeeea0..0352d7a 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=78.8.0
+VERSION=78.9.0
URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_...
for u in $URL; do
diff --git a/icecat.spec b/icecat.spec
index ae7063a..415d6fb 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,9 +48,6 @@
%define _lto_cflags %{nil}
####################
-# Temporarily disabled, filed as rhbz#1932204
-#ExcludeArch: ppc64le
-
# Active/Deactive language files handling
%global build_langpacks 1
@@ -112,8 +109,8 @@
%global __requires_exclude_from ^%{icecatappdir}
Name: icecat
-Version: 78.8.0
-Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 78.9.0
+Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -181,7 +178,6 @@ Patch55: mozilla-1669442.patch
Patch219: rhbz-1173156.patch
Patch220: firefox-nss-version.patch
Patch221: firefox-nss-addon-hack.patch
-Patch222: %{name}-78.7.1-fix_error_template_with_C_linkage.patch
# ARM run-time patch
Patch226: rhbz-1354671.patch
@@ -395,7 +391,6 @@ tar -xf %{SOURCE5}
%patch219 -p1 -b .rhbz-1173156
#%%patch220 -p1 -b .nss-version
%patch221 -p1 -b .firefox-nss-addon-hack
-%patch222 -p1 -b .fix_error_template_with_C_linkage
# ARM run-time patch
%ifarch aarch64
@@ -877,6 +872,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Tue Mar 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.9.0-1.rh1
+- Mozilla Release 78.9.0ESR
+
* Thu Feb 25 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-3.rh1
- Add Mozilla patch #1692706
diff --git a/sources b/sources
index e4b2413..c1ae927 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
-SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
-SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
+SHA512 (icecat-78.9.0-langpacks.tar.gz) = d8eab56257141bdcb9a653ff2058c69b1b84ae7b2a2ecdb3f7b53ac3cd4d15be77d8e2abb375a07fc166d71c850e9d0524eb07892d121c352f9c726997956ea0
+SHA512 (icecat-78.9.0-rh1.tar.bz2) = 278f6200a4fd73a45701e7ac0d5a159150858a9f1f6a165c8d5f789ea0825be9729f09e943fc5ce4b18a6f39ddf2c902e0d24606894ae9efab860e1853d66b73
SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c
commit 7ca16dae639d14b4a2d63d668ddcf1d3e0ba3efa
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 14:27:59 2021 +0100
Update cbindgen (0.16.0)
diff --git a/sources b/sources
index c07326f..e4b2413 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (cbindgen-vendor.tar.xz) = 9503bb9c12610918481dd963a68e184053bf5fcf8def42594350686f46e4518727657b466bd88322d18c2b0fb33b92f7f4cf763928b571f4cdcddba83663dc7d
+SHA512 (cbindgen-vendor.tar.xz) = 6c016bcf40166f6b31531cb1da700706ff982884d65eeafa613031888c42ed6c8fff484403e7c0aa076f36dc722e98c8a9bfff413b933fecd225713b3dee8932
SHA512 (icecat-78.8.0-langpacks.tar.gz) = 2496c0da1bc9de5effd95fc6be75478bd9627a69fcd18e1098b5c5bc41e7ed1b6eb573f9dc355a3cfc4919164ba81ba8c1c7724daff043ff2b1ea13849547aa4
SHA512 (icecat-78.8.0-rh1.tar.bz2) = 7248b9d161628e738a8ea17b5de832adba03c59c54181d708fa53e49b4e1ca13eaa029980cf365c3fba947ca331852ca4bbdc430a2e725b7da177859f401308b
SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
commit 44716e4c48d6d3dac45b942b086e3a1345b84ee4
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 12:03:34 2021 +0100
Fix patch #1692706
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
index 6defdea..b25d5dd 100644
--- a/mozilla-1692706.patch
+++ b/mozilla-1692706.patch
@@ -19,13 +19,14 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
FORMAT_KEYS = {'cache_size', 'cache_max_size'}
-@@ -874,7 +874,8 @@
+@@ -874,7 +874,9 @@
line, self.PRIMARY_CONFIG_DESCRIPTION)
elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
self.secondary_config = self._strip_prefix(
- line, self.SECONDARY_CONFIG_DESCRIPTION)
+ self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
+ "(readonly)",
++ )
else:
for stat_key, stat_description in self.STATS_KEYS:
if line.startswith(stat_description):
commit 223056b0bfef0f51aece2dc93af494686c9fc768
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Feb 25 11:41:17 2021 +0100
Add Mozilla patch #1692706
diff --git a/icecat.spec b/icecat.spec
index 8199de1..ae7063a 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -49,7 +49,7 @@
####################
# Temporarily disabled, filed as rhbz#1932204
-ExcludeArch: ppc64le
+#ExcludeArch: ppc64le
# Active/Deactive language files handling
%global build_langpacks 1
@@ -113,7 +113,7 @@ ExcludeArch: ppc64le
Name: icecat
Version: 78.8.0
-Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 3%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
Summary: GNU version of Firefox browser
# Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -197,6 +197,8 @@ Patch422: mozilla-1580174-webrtc-popup.patch
Patch423: mozilla-1512162.patch
Patch424: %{name}-mozilla-1669471.patch
+Patch425: mozilla-1692706.patch
+
# PGO/LTO patches
Patch600: %{name}-pgo.patch
Patch602: mozilla-1516803.patch
@@ -409,15 +411,16 @@ tar -xf %{SOURCE5}
%patch402 -p1 -b .1196777
%patch403 -p1 -b .1640567
-%patch423 -p1 -b .mozilla-1596503
-%patch424 -p1 -b .mozilla-1669471
+%patch423 -p1 -b .1596503
+%patch424 -p1 -b .1669471
+%patch425 -p1 -b .1692706
# Wayland specific upstream patches
%patch565 -p1 -b .firefox-pipewire
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames
-%patch589 -p1 -b .mozilla-1634213
+%patch589 -p1 -b .1634213
%patch54 -p1 -b .1669639
%patch55 -p1 -b .1669442
@@ -874,6 +877,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/%{name}-wayland.desktop
%changelog
+* Thu Feb 25 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-3.rh1
+- Add Mozilla patch #1692706
+
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-2.rh1
- Exclude Power64 (rhbz#1932204)
- Fix build option for s390x
diff --git a/mozilla-1692706.patch b/mozilla-1692706.patch
new file mode 100644
index 0000000..6defdea
--- /dev/null
+++ b/mozilla-1692706.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Ian Neal <iann_cvs(a)blueyonder.co.uk>
+# Date 1614236439 0
+# Node ID cc45c336687916a6d1bfed79a80dc8a292b139a5
+# Parent 8024f219bda91c98fcbba16f2bfc6b4833014bfc
+Bug 1692706 - Update ccache stats parser for ccache 4.x. r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D105863
+
+diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -842,7 +842,7 @@
+
+ DIRECTORY_DESCRIPTION = "cache directory"
+ PRIMARY_CONFIG_DESCRIPTION = "primary config"
+- SECONDARY_CONFIG_DESCRIPTION = "secondary config (readonly)"
++ SECONDARY_CONFIG_DESCRIPTION = "secondary config"
+ ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
+ FORMAT_KEYS = {'cache_size', 'cache_max_size'}
+
+@@ -874,7 +874,8 @@
+ line, self.PRIMARY_CONFIG_DESCRIPTION)
+ elif line.startswith(self.SECONDARY_CONFIG_DESCRIPTION):
+ self.secondary_config = self._strip_prefix(
+- line, self.SECONDARY_CONFIG_DESCRIPTION)
++ self._strip_prefix(line, self.SECONDARY_CONFIG_DESCRIPTION),
++ "(readonly)",
+ else:
+ for stat_key, stat_description in self.STATS_KEYS:
+ if line.startswith(stat_description):
commit ebc93c5543d22fe08ab561744f84b44da5f38cf0
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Wed Feb 24 12:19:14 2021 +0100
Change some informations
diff --git a/icecat.spec b/icecat.spec
index ea1706c..8199de1 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -48,12 +48,7 @@
%define _lto_cflags %{nil}
####################
-# Exclude ARM builds for rhbz #1658940
-# Exclude s390x for https://pagure.io/koji/issue/1974
-#ExcludeArch: s390x
-
-# PPC64le does not compile on Fedora 33 yet.
-# Temporarily disabled, filed as rhbz#1862012
+# Temporarily disabled, filed as rhbz#1932204
ExcludeArch: ppc64le
# Active/Deactive language files handling
@@ -880,7 +875,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-2.rh1
-- Exclude Power64
+- Exclude Power64 (rhbz#1932204)
- Fix build option for s390x
* Tue Feb 23 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 78.8.0-1.rh1
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/rust-tss-esapi-sys.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-tss-esapi-sys.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-tss-esapi-sys.git/commit/?id....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 042e14fd96db0f0917926171492dd08d5d8de1be
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Mar 23 17:23:19 2021 +0000
initial import
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f83e72a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/tss-esapi-sys-*.crate
diff --git a/rust-tss-esapi-sys.spec b/rust-tss-esapi-sys.spec
new file mode 100644
index 0000000..cc36b9a
--- /dev/null
+++ b/rust-tss-esapi-sys.spec
@@ -0,0 +1,100 @@
+# Generated by rust2rpm 17
+%bcond_with check
+%global debug_package %{nil}
+
+%global crate tss-esapi-sys
+
+Name: rust-%{crate}
+Version: 0.1.0
+Release: 1%{?dist}
+Summary: FFI wrapper around TSS 2.0 Enhanced System API
+
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+URL: https://crates.io/crates/tss-esapi-sys
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+BuildRequires: pkgconfig(tss2-esys) >= 2.3.3
+
+%global _description %{expand:
+FFI wrapper around TSS 2.0 Enhanced System API.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+bindgen-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+bindgen-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "bindgen" feature of "%{crate}" crate.
+
+%files -n %{name}+bindgen-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+generate-bindings-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+generate-bindings-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "generate-bindings" feature of "%{crate}" crate.
+
+%files -n %{name}+generate-bindings-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires -a
+
+%build
+%cargo_build -a
+
+%install
+%cargo_install -a
+
+%if %{with check}
+%check
+%cargo_test -a
+%endif
+
+%changelog
+* Tue Mar 23 2021 Peter Robinson <pbrobinson(a)gmail.com> - 0.1.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..02f0b94
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (tss-esapi-sys-0.1.0.crate) = 5108539bfc35f59ed4081f5685ee00dc59067d4fb318e6e97300e76e581d7bfd73dd9404c866391d3a009cc3059196ba388ccbcaef280ce6afea2dc501ab9995
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/zlib.git
by githook-noreply＠fedoraproject.org
The package rpms/zlib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/zlib.git/commit/?id=c95d3d1e735ec...
https://src.fedoraproject.org/cgit/rpms/zlib.git/commit/?id=3ba936014f04b....
Change:
-%ifarch aarch64
-%ifarch ppc64
Thanks.
Full change:
============
commit c95d3d1e735ec5acd3b2b27d64ad4530a19e9049
Author: Ondrej Dubaj <odubaj(a)redhat.com>
Date: Wed Mar 17 11:12:21 2021 +0100
drop aarch64 optimalizations due to breakage of ABI compatibility in openjdk (#1936823)
diff --git a/0001-Neon-Optimized-hash-chain-rebase.patch b/0001-Neon-Optimized-hash-chain-rebase.patch
deleted file mode 100644
index e6f909f..0000000
--- a/0001-Neon-Optimized-hash-chain-rebase.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From f0fd8c553fa024c599f4aff65d7c603ceeaa6a58 Mon Sep 17 00:00:00 2001
-From: Adenilson Cavalcanti <adenilson.cavalcanti(a)arm.com>
-Date: Mon, 9 Apr 2018 13:52:17 -0700
-Subject: [PATCH 1/3] Neon-Optimized hash chain rebase
-
-This should help with compression of data, using NEON instructions
-(therefore useful for ARMv7/ARMv8).
-
-Original patch by Jun He.
----
- CMakeLists.txt | 18 ++++++++
- contrib/arm/neon_slide_hash.h | 84 +++++++++++++++++++++++++++++++++++
- deflate.c | 7 +++
- 3 files changed, 109 insertions(+)
- create mode 100644 contrib/arm/neon_slide_hash.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0fe939d..e9a74e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,6 +136,24 @@ if(CMAKE_COMPILER_IS_GNUCC)
- set(ZLIB_ASMS contrib/amd64/amd64-match.S)
- endif ()
-
-+ if(ARM_NEON)
-+ list(REMOVE_ITEM ZLIB_SRCS inflate.c)
-+ set(ZLIB_ARM_NEON_HDRS
-+ contrib/arm/chunkcopy.h
-+ contrib/arm/inffast_chunk.h
-+ contrib/arm/neon_slide_hash.h)
-+ set(ZLIB_ARM_NEON contrib/arm/inflate.c contrib/arm/inffast_chunk.c)
-+ add_definitions(-DARM_NEON)
-+ set(COMPILER ${CMAKE_C_COMPILER})
-+ # NEON is mandatory in ARMv8.
-+ if(${COMPILER} MATCHES "aarch64")
-+ set_source_files_properties(${ZLIB_ARM_NEON} PROPERTIES LANGUAGE C COMPILE_FLAGS -march=armv8-a)
-+ # But it was optional for ARMv7.
-+ elseif(${COMPILER} MATCHES "arm")
-+ set_source_files_properties(${ZLIB_ARM_NEON} PROPERTIES LANGUAGE C COMPILE_FLAGS -mfpu=neon)
-+ endif()
-+ endif()
-+
- if(ZLIB_ASMS)
- add_definitions(-DASMV)
- set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-diff --git a/contrib/arm/neon_slide_hash.h b/contrib/arm/neon_slide_hash.h
-new file mode 100644
-index 0000000..0daffa1
---- /dev/null
-+++ b/contrib/arm/neon_slide_hash.h
-@@ -0,0 +1,84 @@
-+/* Copyright (C) 1995-2011, 2016 Mark Adler
-+ * Copyright (C) 2017 ARM Holdings Inc.
-+ * Authors: Adenilson Cavalcanti <adenilson.cavalcanti(a)arm.com>
-+ * Jun He <jun.he(a)arm.com>
-+ * This software is provided 'as-is', without any express or implied
-+ * warranty. In no event will the authors be held liable for any damages
-+ * arising from the use of this software.
-+ * Permission is granted to anyone to use this software for any purpose,
-+ * including commercial applications, and to alter it and redistribute it
-+ * freely, subject to the following restrictions:
-+ * 1. The origin of this software must not be misrepresented; you must not
-+ * claim that you wrote the original software. If you use this software
-+ * in a product, an acknowledgment in the product documentation would be
-+ * appreciated but is not required.
-+ * 2. Altered source versions must be plainly marked as such, and must not be
-+ * misrepresented as being the original software.
-+ * 3. This notice may not be removed or altered from any source distribution.
-+ */
-+#ifndef __NEON_SLIDE_HASH__
-+#define __NEON_SLIDE_HASH__
-+
-+#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
-+#include "deflate.h"
-+#include <arm_neon.h>
-+
-+inline static void neon_slide_hash(deflate_state *s)
-+{
-+ /*
-+ * This is ASIMD implementation for hash table rebase
-+ * it assumes:
-+ * 1. hash chain offset (Pos) is 2 bytes
-+ * 2. hash table size is multiple*128 bytes
-+ * #1 should be true as Pos is defined as "ush"
-+ * #2 should be true as hash_bits are greater that 7
-+ */
-+ unsigned n, m;
-+ unsigned short wsize = s->w_size;
-+ uint16x8_t v, *p;
-+ size_t size;
-+
-+ size = s->hash_size*sizeof(s->head[0]);
-+ Assert((size % sizeof(uint16x8_t) * 8 == 0), "hash table size err");
-+
-+ Assert(sizeof(Pos) == 2, "Wrong Pos size");
-+
-+ /* slide s->head */
-+ v = vdupq_n_u16(wsize);
-+ p = (uint16x8_t *)(s->head);
-+ n = size / (sizeof(uint16x8_t) * 8);
-+ do {
-+ p[0] = vqsubq_u16(p[0], v);
-+ p[1] = vqsubq_u16(p[1], v);
-+ p[2] = vqsubq_u16(p[2], v);
-+ p[3] = vqsubq_u16(p[3], v);
-+ p[4] = vqsubq_u16(p[4], v);
-+ p[5] = vqsubq_u16(p[5], v);
-+ p[6] = vqsubq_u16(p[6], v);
-+ p[7] = vqsubq_u16(p[7], v);
-+ p += 8;
-+ } while (--n);
-+#ifndef FASTEST
-+ /* slide s->prev */
-+ size = wsize*sizeof(s->prev[0]);
-+
-+ Assert((size % sizeof(uint16x8_t) * 8 == 0), "hash table size err");
-+
-+ p = (uint16x8_t *)(s->prev);
-+ n = size / (sizeof(uint16x8_t) * 8);
-+ do {
-+ p[0] = vqsubq_u16(p[0], v);
-+ p[1] = vqsubq_u16(p[1], v);
-+ p[2] = vqsubq_u16(p[2], v);
-+ p[3] = vqsubq_u16(p[3], v);
-+ p[4] = vqsubq_u16(p[4], v);
-+ p[5] = vqsubq_u16(p[5], v);
-+ p[6] = vqsubq_u16(p[6], v);
-+ p[7] = vqsubq_u16(p[7], v);
-+ p += 8;
-+ } while (--n);
-+#endif
-+}
-+
-+#endif
-+#endif
-diff --git a/deflate.c b/deflate.c
-index 1ec7614..36f99ac 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -50,6 +50,9 @@
- /* @(#) $Id$ */
-
- #include "deflate.h"
-+#if __ARM_NEON
-+#include "contrib/arm/neon_slide_hash.h"
-+#endif
-
- const char deflate_copyright[] =
- " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-@@ -201,6 +204,9 @@ local const config configuration_table[10] = {
- local void slide_hash(s)
- deflate_state *s;
- {
-+#if ARM_NEON
-+ return neon_slide_hash(s);
-+#else
- unsigned n, m;
- Posf *p;
- uInt wsize = s->w_size;
-@@ -222,6 +228,7 @@ local void slide_hash(s)
- */
- } while (--n);
- #endif
-+#endif
- }
-
- /* ========================================================================= */
---
-2.19.0
-
diff --git a/0002-Porting-optimized-longest_match.patch b/0002-Porting-optimized-longest_match.patch
deleted file mode 100644
index 7fda12e..0000000
--- a/0002-Porting-optimized-longest_match.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 17a154db6774a4acf347cfc5189eaf2cd675e696 Mon Sep 17 00:00:00 2001
-From: Adenilson Cavalcanti <adenilson.cavalcanti(a)arm.com>
-Date: Mon, 9 Apr 2018 15:14:19 -0700
-Subject: [PATCH 2/3] Porting optimized longest_match
-
-This patch was contributed to zlib-ng and features an improved longest_match
-function using the most distant hash code to reduce number of checks
-(see: http://www.gildor.org/en/projects/zlib).
-
-Original patch by Jun He.
----
- CMakeLists.txt | 3 +-
- contrib/arm/arm_longest_match.h | 142 ++++++++++++++++++++++++++++++++
- deflate.c | 11 ++-
- 3 files changed, 152 insertions(+), 4 deletions(-)
- create mode 100644 contrib/arm/arm_longest_match.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9a74e9..3826eba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
- set(ZLIB_ARM_NEON_HDRS
- contrib/arm/chunkcopy.h
- contrib/arm/inffast_chunk.h
-- contrib/arm/neon_slide_hash.h)
-+ contrib/arm/neon_slide_hash.h
-+ contrib/arm/arm_longest_match.h)
- set(ZLIB_ARM_NEON contrib/arm/inflate.c contrib/arm/inffast_chunk.c)
- add_definitions(-DARM_NEON)
- set(COMPILER ${CMAKE_C_COMPILER})
-diff --git a/contrib/arm/arm_longest_match.h b/contrib/arm/arm_longest_match.h
-new file mode 100644
-index 0000000..9e7083f
---- /dev/null
-+++ b/contrib/arm/arm_longest_match.h
-@@ -0,0 +1,142 @@
-+/* Copyright (C) 1995-2011, 2016 Mark Adler
-+ * Copyright (C) 2017 ARM Holdings Inc.
-+ * Authors: Adenilson Cavalcanti <adenilson.cavalcanti(a)arm.com>
-+ * Jun He <jun.he(a)arm.com>
-+ * This software is provided 'as-is', without any express or implied
-+ * warranty. In no event will the authors be held liable for any damages
-+ * arising from the use of this software.
-+ * Permission is granted to anyone to use this software for any purpose,
-+ * including commercial applications, and to alter it and redistribute it
-+ * freely, subject to the following restrictions:
-+ * 1. The origin of this software must not be misrepresented; you must not
-+ * claim that you wrote the original software. If you use this software
-+ * in a product, an acknowledgment in the product documentation would be
-+ * appreciated but is not required.
-+ * 2. Altered source versions must be plainly marked as such, and must not be
-+ * misrepresented as being the original software.
-+ * 3. This notice may not be removed or altered from any source distribution.
-+ */
-+#ifndef __ARM_LONGEST__MATCH__
-+#define __ARM_LONGEST__MATCH__
-+
-+#if defined(ARM_NEON)
-+#include "deflate.h"
-+#include <stdint.h>
-+static inline long get_match_len(const unsigned char *a, const unsigned char *b, long max)
-+{
-+ register int len = 0;
-+ register unsigned long xor = 0;
-+ register int check_loops = max/sizeof(unsigned long);
-+ while(check_loops-- > 0) {
-+ xor = (*(unsigned long *)(a+len)) ^ (*(unsigned long *)(b+len));
-+ if (xor) break;
-+ len += sizeof(unsigned long);
-+ }
-+ if (0 == xor) {
-+ while (len < max) {
-+ if (a[len] != b[len]) break;
-+ len++;
-+ }
-+ return len;
-+ }
-+ xor = __builtin_ctzl(xor)>>3;
-+ return len + xor;
-+}
-+
-+/*
-+ * This implementation is based on algorithm described at:
-+ * http://www.gildor.org/en/projects/zlib
-+ * It uses the hash chain indexed by the most distant hash code to
-+ * reduce number of checks.
-+ * This also eliminates the those unnecessary check loops in legacy
-+ * longest_match's do..while loop if the "most distant code" is out
-+ * of search buffer
-+ *
-+ */
-+static inline unsigned arm_longest_match(deflate_state *const s, IPos cur_match) {
-+ unsigned chain_length = s->max_chain_length;/* max hash chain length */
-+ unsigned char *scan = s->window + s->strstart; /* current string */
-+ unsigned char *match; /* matched string */
-+ unsigned int len; /* length of current match */
-+ unsigned int best_len = s->prev_length; /* best match length so far */
-+ unsigned int nice_match = s->nice_match; /* stop if match long enough */
-+ IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-+ s->strstart - (IPos)MAX_DIST(s) : 0;
-+ /* Stop when cur_match becomes <= limit. To simplify the code,
-+ * we prevent matches with the string of window index 0.
-+ */
-+ int offset = 0; /* offset of the head[most_distant_hash] from IN cur_match */
-+ Pos *prev = s->prev;
-+ unsigned int wmask = s->w_mask;
-+ unsigned char *scan_buf_base = s->window;
-+
-+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-+ * It is easy to get rid of this optimization if necessary.
-+ */
-+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-+
-+ /* Do not look for matches beyond the end of the input. This is necessary
-+ * to make deflate deterministic.
-+ */
-+ if ((unsigned int)nice_match > s->lookahead) nice_match = s->lookahead;
-+
-+ Assert((unsigned long)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-+
-+ /* find most distant hash code for lazy_match */
-+ if (best_len > MIN_MATCH) {
-+ /* search for most distant hash code */
-+ int i;
-+ uint16_t hash = 0;
-+ IPos pos;
-+
-+ UPDATE_HASH(s, hash, scan[1]);
-+ UPDATE_HASH(s, hash, scan[2]);
-+ for (i = 3; i <= best_len; i++) {
-+ UPDATE_HASH(s, hash, scan[i]);
-+ /* get head IPos of hash calced by scan[i-2..i] */
-+ pos = s->head[hash];
-+ /* compare it to current "farthest hash" IPos */
-+ if (pos <= cur_match) {
-+ /* we have a new "farthest hash" now */
-+ offset = i - 2;
-+ cur_match = pos;
-+ }
-+ }
-+
-+ /* update variables to correspond offset */
-+ limit += offset;
-+ /*
-+ * check if the most distant code's offset is out of search buffer
-+ * if it is true, then this means scan[offset..offset+2] are not
-+ * presented in the search buffer. So we just return best_len
-+ * we've found.
-+ */
-+ if (cur_match < limit) return best_len;
-+
-+ scan_buf_base -= offset;
-+ /* reduce hash search depth based on best_len */
-+ chain_length /= best_len - MIN_MATCH;
-+ }
-+
-+ do {
-+ Assert(cur_match < s->strstart, "no future");
-+
-+ /* Determine matched length at current pos */
-+ match = scan_buf_base + cur_match;
-+ len = get_match_len(match, scan, MAX_MATCH);
-+
-+ if (len > best_len) {
-+ /* found longer string */
-+ s->match_start = cur_match - offset;
-+ best_len = len;
-+ /* good enough? */
-+ if (len >= nice_match) break;
-+ }
-+ /* move to prev pos in this hash chain */
-+ } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length != 0);
-+
-+ return (best_len <= s->lookahead)? best_len : s->lookahead;
-+}
-+
-+#endif
-+#endif
-diff --git a/deflate.c b/deflate.c
-index 36f99ac..4c42259 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -50,9 +50,6 @@
- /* @(#) $Id$ */
-
- #include "deflate.h"
--#if __ARM_NEON
--#include "contrib/arm/neon_slide_hash.h"
--#endif
-
- const char deflate_copyright[] =
- " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-@@ -196,6 +193,11 @@ local const config configuration_table[10] = {
- s->head[s->hash_size-1] = NIL; \
- zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-+#if defined(ARM_NEON)
-+#include "contrib/arm/arm_longest_match.h"
-+#include "contrib/arm/neon_slide_hash.h"
-+#endif
-+
- /* ===========================================================================
- * Slide the hash table when sliding the window down (could be avoided with 32
- * bit values at the expense of memory usage). We slide even when level == 0 to
-@@ -1244,6 +1246,9 @@ local uInt longest_match(s, cur_match)
- deflate_state *s;
- IPos cur_match; /* current match */
- {
-+#if defined(ARM_NEON)
-+ return arm_longest_match(s, cur_match);
-+#endif
- unsigned chain_length = s->max_chain_length;/* max hash chain length */
- register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
---
-2.19.0
-
diff --git a/0003-arm64-specific-build-patch.patch b/0003-arm64-specific-build-patch.patch
deleted file mode 100644
index b8b6b55..0000000
--- a/0003-arm64-specific-build-patch.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e0be75f8dce27a4e32196529df2a08dca791a286 Mon Sep 17 00:00:00 2001
-From: Jeremy Linton <jeremy.linton(a)arm.com>
-Date: Fri, 6 Apr 2018 11:46:42 -0500
-Subject: [PATCH 3/3] arm64 specific build patch
-
----
- Makefile.in | 19 ++++++++++++-------
- configure | 2 +-
- contrib/minizip/zip.c | 6 ++++--
- 3 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5a77949..9f088e5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -57,7 +57,7 @@ SRCDIR=
- ZINC=
- ZINCOUT=-I.
-
--OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
-+OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inffast.o inflate.o inftrees.o trees.o zutil.o
- OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
- OBJC = $(OBJZ) $(OBJG)
-
-@@ -163,16 +163,16 @@ crc32.o: $(SRCDIR)crc32.c
- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
-
- deflate.o: $(SRCDIR)deflate.c
-- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
-+ $(CC) $(CFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -c -o $@ $(SRCDIR)deflate.c
-
- infback.o: $(SRCDIR)infback.c
- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
-
- inffast.o: $(SRCDIR)inffast.c
-- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
-+ $(CC) $(CFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -c -o $@ $(SRCDIR)inffast.c
-
- inflate.o: $(SRCDIR)inflate.c
-- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
-+ $(CC) $(CFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -c -o $@ $(SRCDIR)inflate.c
-
- inftrees.o: $(SRCDIR)inftrees.c
- $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
-@@ -214,7 +214,7 @@ crc32.lo: $(SRCDIR)crc32.c
-
- deflate.lo: $(SRCDIR)deflate.c
- -@mkdir objs 2>/dev/null || test -d objs
-- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
-+ $(CC) $(SFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
- -@mv objs/deflate.o $@
-
- infback.lo: $(SRCDIR)infback.c
-@@ -222,14 +222,19 @@ infback.lo: $(SRCDIR)infback.c
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
- -@mv objs/infback.o $@
-
-+arminffast.lo: $(SRCDIR)contrib/arm/inffast_chunk.c $(SRCDIR)inffast.c
-+ -@mkdir objs 2>/dev/null || test -d objs
-+ $(CC) $(SFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -DPIC -c -o objs/arminffast.o $(SRCDIR)contrib/arm/inffast_chunk.c
-+ -@mv objs/arminffast.o $@
-+
- inffast.lo: $(SRCDIR)inffast.c
- -@mkdir objs 2>/dev/null || test -d objs
-- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
-+ $(CC) $(SFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
- -@mv objs/inffast.o $@
-
- inflate.lo: $(SRCDIR)inflate.c
- -@mkdir objs 2>/dev/null || test -d objs
-- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
-+ $(CC) $(SFLAGS) $(ZINC) -I$(SRCDIR) -I$(SRCDIR)contrib/arm -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
- -@mv objs/inflate.o $@
-
- inftrees.lo: $(SRCDIR)inftrees.c
-diff --git a/configure b/configure
-index e974d1f..0c5f837 100755
---- a/configure
-+++ b/configure
-@@ -23,7 +23,7 @@ SRCDIR=`dirname $0`
- if test $SRCDIR = "."; then
- ZINC=""
- ZINCOUT="-I."
-- SRCDIR=""
-+ SRCDIR="./"
- else
- ZINC='-include zconf.h'
- ZINCOUT='-I. -I$(SRCDIR)'
-diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
-index 44e88a9..0517930 100644
---- a/contrib/minizip/zip.c
-+++ b/contrib/minizip/zip.c
-@@ -519,15 +519,17 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
-+ {
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
- {
- uPosFound = uReadPos+i;
- break;
- }
-+ }
-
-- if (uPosFound!=0)
-- break;
-+ if (uPosFound!=0)
-+ break;
- }
- TRYFREE(buf);
- return uPosFound;
---
-2.19.0
-
diff --git a/zlib.spec b/zlib.spec
index 35c314f..08a7307 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -13,10 +13,6 @@ Source: https://www.zlib.net/zlib-%{version}.tar.xz
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
# resolves: #805113
Patch1: zlib-1.2.11-optimized-s390.patch
-# general aarch64 optimizations
-Patch4: 0001-Neon-Optimized-hash-chain-rebase.patch
-Patch5: 0002-Porting-optimized-longest_match.patch
-Patch6: 0003-arm64-specific-build-patch.patch
# IBM Z optimalizations
Patch7: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-s390x.patch
# IBM CRC32 optimalization for POWER archs
@@ -92,11 +88,6 @@ developing applications which use minizip.
%ifarch s390 s390x
%patch1 -p1 -b .optimized-deflate
%endif
-%ifarch aarch64
-%patch4 -p1 -b .optimize-aarch64
-%patch5 -p1 -b .optimize-aarch64
-%patch6 -p1 -b .optimize-aarch64
-%endif
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -113,9 +104,6 @@ mv ChangeLog.tmp ChangeLog
%build
export CFLAGS="$RPM_OPT_FLAGS"
-%ifarch aarch64
-CFLAGS+=" -DARM_NEON -O3"
-%endif
%ifarch s390 s390x
CFLAGS+=" -DDFLTCC"
%endif
@@ -191,6 +179,7 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
* Fri Feb 12 2021 Michal Schorm <mschorm(a)redhat.com> - 1.2.11-25
- Remove ancient PPC64 hack
+- Remove aarch64 optimalizations (#1936823)
* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit 3ba936014f04bed43be1205fe61e009170f5d44d
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Fri Feb 12 11:59:14 2021 +0100
Remove the ancient PPC64 hack
The package should honor the global build flags
diff --git a/zlib.spec b/zlib.spec
index 0e70262..35c314f 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -2,7 +2,7 @@
Name: zlib
Version: 1.2.11
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: Compression and decompression library
# /contrib/dotzlib/ have Boost license
License: zlib and Boost
@@ -113,9 +113,6 @@ mv ChangeLog.tmp ChangeLog
%build
export CFLAGS="$RPM_OPT_FLAGS"
-%ifarch ppc64
-CFLAGS+=" -O3"
-%endif
%ifarch aarch64
CFLAGS+=" -DARM_NEON -O3"
%endif
@@ -192,6 +189,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
+* Fri Feb 12 2021 Michal Schorm <mschorm(a)redhat.com> - 1.2.11-25
+- Remove ancient PPC64 hack
+
* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.11-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/vapoursynth.git
by githook-noreply＠fedoraproject.org
The package rpms/vapoursynth.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vapoursynth.git/commit/?id=5cfca1....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit cdbbdd5b25b02632a8fa217cda4a3779b8e1ce4b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:31:00 2021 +0100
Update sources
diff --git a/.gitignore b/.gitignore
index 6c565b5..be14818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vapoursynth-R48.tar.gz
+/vapoursynth-R51.tar.gz
diff --git a/sources b/sources
index 2dd9c19..c687eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vapoursynth-R48.tar.gz) = 0d151dd384c97f103f8d96ea083909001e0b690af4362c64685c04efde874f4a8ff038b5149beb40688d6f9e0a4cc86d9618b6cc8a3066a270d81c2b6f1d068e
+SHA512 (vapoursynth-R51.tar.gz) = feb218aa309e538a32054b4fdeaf291e5c817e1b49bd482cf9dfc6c17d055c367dc27f80863770ae3333a4d115c026ad47609ed70857d89c22ff16f5cc6d5292
commit 5cfca1ca8fb06df4140664c38f13a4d2ae7ee844
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:10:05 2021 +0100
Update to R51, allow building for other archs beside x86
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
index fe8b2d8..29e4722 100644
--- a/vapoursynth-gcc11.patch
+++ b/vapoursynth-gcc11.patch
@@ -1,7 +1,6 @@
-diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
-index 8e6f154..1971f18 100644
---- a/src/core/exprfilter.cpp
-+++ b/src/core/exprfilter.cpp
+diff -Naur vapoursynth-R51.old/src/core/exprfilter.cpp vapoursynth-R51/src/core/exprfilter.cpp
+--- vapoursynth-R51.old/src/core/exprfilter.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/exprfilter.cpp 2021-03-23 14:36:17.148054372 +0100
@@ -32,6 +32,7 @@
#include <unordered_map>
#include <unordered_set>
@@ -10,10 +9,9 @@ index 8e6f154..1971f18 100644
#include "VapourSynth.h"
#include "VSHelper.h"
#include "cpufeatures.h"
-diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
-index 613d98f..327512c 100644
---- a/src/core/genericfilters.cpp
-+++ b/src/core/genericfilters.cpp
+diff -Naur vapoursynth-R51.old/src/core/genericfilters.cpp vapoursynth-R51/src/core/genericfilters.cpp
+--- vapoursynth-R51.old/src/core/genericfilters.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/genericfilters.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -28,6 +28,7 @@
#include <array>
#include <memory>
@@ -22,10 +20,9 @@ index 613d98f..327512c 100644
#include <VapourSynth.h>
#include <VSHelper.h>
#include "cpufeatures.h"
-diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
-index f4477bd..c00c619 100644
---- a/src/core/kernel/generic.cpp
-+++ b/src/core/kernel/generic.cpp
+diff -Naur vapoursynth-R51.old/src/core/kernel/generic.cpp vapoursynth-R51/src/core/kernel/generic.cpp
+--- vapoursynth-R51.old/src/core/kernel/generic.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/kernel/generic.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -22,6 +22,7 @@
#include <array>
#include <cmath>
@@ -34,23 +31,21 @@ index f4477bd..c00c619 100644
#include <type_traits>
#include "generic.h"
-diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
-index b4a727a..8931cbb 100644
---- a/src/filters/misc/miscfilters.cpp
-+++ b/src/filters/misc/miscfilters.cpp
-@@ -25,6 +25,7 @@
- #include <cstddef>
+diff -Naur vapoursynth-R51.old/src/filters/misc/miscfilters.cpp vapoursynth-R51/src/filters/misc/miscfilters.cpp
+--- vapoursynth-R51.old/src/filters/misc/miscfilters.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/misc/miscfilters.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
#include <memory>
+ #include <stdexcept>
#include <vector>
+#include <limits>
#include <VapourSynth.h>
#include <VSHelper.h>
#include "../src/core/filtersharedcpp.h"
-diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
-index 5fdc6b2..2507119 100644
---- a/src/filters/removegrain/clense.cpp
-+++ b/src/filters/removegrain/clense.cpp
-@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+diff -Naur vapoursynth-R51.old/src/filters/removegrain/clense.cpp vapoursynth-R51/src/filters/removegrain/clense.cpp
+--- vapoursynth-R51.old/src/filters/removegrain/clense.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/removegrain/clense.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
*/
#include "shared.h"
diff --git a/vapoursynth-python38.patch b/vapoursynth-python38.patch
deleted file mode 100644
index 94ba351..0000000
--- a/vapoursynth-python38.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11 Mon Sep 17 00:00:00 2001
-From: cantabile <cantabile.desu(a)gmail.com>
-Date: Sun, 26 Jan 2020 00:00:22 +0200
-Subject: [PATCH] Fix compilation with Python 3.8.
-
-Fixes https://github.com/vapoursynth/vapoursynth/issues/518.
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1d1b05fc..7dcde996 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,13 @@ AS_IF(
- [
- AM_PATH_PYTHON([3])
-
-- PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-
- AC_CONFIG_FILES([pc/vapoursynth-script.pc])
- ]
-@@ -292,7 +298,15 @@ AS_IF(
-
- AS_IF(
- [test -z "$PYTHON3_LIBS"],
-- [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])]
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-+ ]
- )
-
- AS_CASE(
diff --git a/vapoursynth-version-info.patch b/vapoursynth-version-info.patch
index 0ad2ed7..e7d1725 100644
--- a/vapoursynth-version-info.patch
+++ b/vapoursynth-version-info.patch
@@ -1,12 +1,12 @@
-diff -U3 vapoursynth-R48.orig/Makefile.am vapoursynth-R48/Makefile.am
---- vapoursynth-R48.orig/Makefile.am 2019-10-25 09:16:07.000000000 +0300
-+++ vapoursynth-R48/Makefile.am 2019-12-01 01:28:57.161837465 +0300
-@@ -89,7 +89,7 @@
+diff -Naur vapoursynth-R51.old/Makefile.am vapoursynth-R51/Makefile.am
+--- vapoursynth-R51.old/Makefile.am 2021-03-23 14:27:12.519657875 +0100
++++ vapoursynth-R51/Makefile.am 2021-03-23 14:27:19.806783602 +0100
+@@ -79,7 +79,7 @@
pkgconfig_DATA += pc/vapoursynth.pc
-libvapoursynth_la_LDFLAGS = -no-undefined -avoid-version
+libvapoursynth_la_LDFLAGS = -no-undefined -version-info $(PACKAGE_VERSION)
libvapoursynth_la_CPPFLAGS = $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
- libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la libvapoursynth_avx2.la
+ libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
diff --git a/vapoursynth.spec b/vapoursynth.spec
index ba22267..ba4d5dd 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -1,22 +1,19 @@
#global _with_tests 1
-#global _with_ffmpeg 1
+#global _with_subtitles 1
#global _with_ImageMagick 1
Name: vapoursynth
-Version: 48
-Release: 11%{?dist}
+Version: 51
+Release: 1%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
-Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
-Patch2: %{name}-gcc11.patch
+Patch1: %{name}-gcc11.patch
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -38,7 +35,7 @@ BuildRequires: python3dist(pytest)
BuildRequires: pkgconfig(Magick++) >= 7.0
}
-%{?_with_ffmpeg:
+%{?_with_subtitles:
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -109,7 +106,7 @@ autoreconf -vif
--enable-morpho \
--enable-ocr \
--enable-removegrain \
- --%{?_with_ffmpeg:enable}%{!?_with_ffmpeg:disable}-subtext \
+ --%{?_with_subtitles:enable}%{!?_with_subtitles:disable}-subtext \
--enable-vinverse \
--enable-vivtc \
@@ -136,7 +133,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%files libs
%doc ChangeLog
-%license COPYING.LGPLv2.1 ofl.txt
+%license COPYING.LESSER
%dir %{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}-script.so.*
@@ -160,6 +157,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Tue Mar 23 2021 Simone Caronni <negativo17(a)gmail.com> - 51-1
+- Update to R51.
+- Allow building for other archs beside x86.
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit be02be55074ba9c68aff93ffdea0e8ca6a03c7fc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 22:54:56 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vapoursynth.spec b/vapoursynth.spec
index 23a9660..ba22267 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -160,6 +160,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sat Oct 17 2020 Jeff Law <law(a)redhat.com> - 48-10
- Fix missing #include for gcc-11
commit 1991e0f599c93577b5182d392c7a77b1d1542b2f
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Sat Jan 9 00:34:55 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/vapoursynth.spec b/vapoursynth.spec
index e3f047a..23a9660 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -16,6 +16,7 @@ Patch2: %{name}-gcc11.patch
ExclusiveArch: %{ix86} x86_64
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
commit 92baa573a3b302bdd8becda159e73000b03ee948
Author: Jeff Law <law(a)redhat.com>
Date: Sat Oct 17 11:22:29 2020 -0600
Fix missing #includes for gcc-11
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
new file mode 100644
index 0000000..fe8b2d8
--- /dev/null
+++ b/vapoursynth-gcc11.patch
@@ -0,0 +1,60 @@
+diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
+index 8e6f154..1971f18 100644
+--- a/src/core/exprfilter.cpp
++++ b/src/core/exprfilter.cpp
+@@ -32,6 +32,7 @@
+ #include <unordered_map>
+ #include <unordered_set>
+ #include <vector>
++#include <limits>
+ #include "VapourSynth.h"
+ #include "VSHelper.h"
+ #include "cpufeatures.h"
+diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
+index 613d98f..327512c 100644
+--- a/src/core/genericfilters.cpp
++++ b/src/core/genericfilters.cpp
+@@ -28,6 +28,7 @@
+ #include <array>
+ #include <memory>
+ #include <vector>
++#include <limits>
+ #include <VapourSynth.h>
+ #include <VSHelper.h>
+ #include "cpufeatures.h"
+diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
+index f4477bd..c00c619 100644
+--- a/src/core/kernel/generic.cpp
++++ b/src/core/kernel/generic.cpp
+@@ -22,6 +22,7 @@
+ #include <array>
+ #include <cmath>
+ #include <cstdint>
++#include <limits>
+ #include <type_traits>
+ #include "generic.h"
+
+diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
+index b4a727a..8931cbb 100644
+--- a/src/filters/misc/miscfilters.cpp
++++ b/src/filters/misc/miscfilters.cpp
+@@ -25,6 +25,7 @@
+ #include <cstddef>
+ #include <memory>
+ #include <vector>
++#include <limits>
+ #include <VapourSynth.h>
+ #include <VSHelper.h>
+ #include "../src/core/filtersharedcpp.h"
+diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
+index 5fdc6b2..2507119 100644
+--- a/src/filters/removegrain/clense.cpp
++++ b/src/filters/removegrain/clense.cpp
+@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ #include "shared.h"
++#include <limits>
+
+ #define CLENSE_RETERROR(x) do { vsapi->setError(out, (x)); vsapi->freeNode(d.cnode); vsapi->freeNode(d.pnode); vsapi->freeNode(d.nnode); return; } while (0)
+ #define CLAMP(value, lower, upper) do { if (value < lower) value = lower; else if (value > upper) value = upper; } while(0)
diff --git a/vapoursynth.spec b/vapoursynth.spec
index f89afdb..e3f047a 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -12,6 +12,7 @@ URL: http://www.vapoursynth.com
Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
+Patch2: %{name}-gcc11.patch
ExclusiveArch: %{ix86} x86_64
@@ -158,6 +159,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Sat Oct 17 2020 Jeff Law <law(a)redhat.com> - 48-10
+- Fix missing #include for gcc-11
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/vapoursynth.git
by githook-noreply＠fedoraproject.org
The package rpms/vapoursynth.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vapoursynth.git/commit/?id=5cfca1....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit cdbbdd5b25b02632a8fa217cda4a3779b8e1ce4b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:31:00 2021 +0100
Update sources
diff --git a/.gitignore b/.gitignore
index 6c565b5..be14818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vapoursynth-R48.tar.gz
+/vapoursynth-R51.tar.gz
diff --git a/sources b/sources
index 2dd9c19..c687eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vapoursynth-R48.tar.gz) = 0d151dd384c97f103f8d96ea083909001e0b690af4362c64685c04efde874f4a8ff038b5149beb40688d6f9e0a4cc86d9618b6cc8a3066a270d81c2b6f1d068e
+SHA512 (vapoursynth-R51.tar.gz) = feb218aa309e538a32054b4fdeaf291e5c817e1b49bd482cf9dfc6c17d055c367dc27f80863770ae3333a4d115c026ad47609ed70857d89c22ff16f5cc6d5292
commit 5cfca1ca8fb06df4140664c38f13a4d2ae7ee844
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:10:05 2021 +0100
Update to R51, allow building for other archs beside x86
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
index fe8b2d8..29e4722 100644
--- a/vapoursynth-gcc11.patch
+++ b/vapoursynth-gcc11.patch
@@ -1,7 +1,6 @@
-diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
-index 8e6f154..1971f18 100644
---- a/src/core/exprfilter.cpp
-+++ b/src/core/exprfilter.cpp
+diff -Naur vapoursynth-R51.old/src/core/exprfilter.cpp vapoursynth-R51/src/core/exprfilter.cpp
+--- vapoursynth-R51.old/src/core/exprfilter.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/exprfilter.cpp 2021-03-23 14:36:17.148054372 +0100
@@ -32,6 +32,7 @@
#include <unordered_map>
#include <unordered_set>
@@ -10,10 +9,9 @@ index 8e6f154..1971f18 100644
#include "VapourSynth.h"
#include "VSHelper.h"
#include "cpufeatures.h"
-diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
-index 613d98f..327512c 100644
---- a/src/core/genericfilters.cpp
-+++ b/src/core/genericfilters.cpp
+diff -Naur vapoursynth-R51.old/src/core/genericfilters.cpp vapoursynth-R51/src/core/genericfilters.cpp
+--- vapoursynth-R51.old/src/core/genericfilters.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/genericfilters.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -28,6 +28,7 @@
#include <array>
#include <memory>
@@ -22,10 +20,9 @@ index 613d98f..327512c 100644
#include <VapourSynth.h>
#include <VSHelper.h>
#include "cpufeatures.h"
-diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
-index f4477bd..c00c619 100644
---- a/src/core/kernel/generic.cpp
-+++ b/src/core/kernel/generic.cpp
+diff -Naur vapoursynth-R51.old/src/core/kernel/generic.cpp vapoursynth-R51/src/core/kernel/generic.cpp
+--- vapoursynth-R51.old/src/core/kernel/generic.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/kernel/generic.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -22,6 +22,7 @@
#include <array>
#include <cmath>
@@ -34,23 +31,21 @@ index f4477bd..c00c619 100644
#include <type_traits>
#include "generic.h"
-diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
-index b4a727a..8931cbb 100644
---- a/src/filters/misc/miscfilters.cpp
-+++ b/src/filters/misc/miscfilters.cpp
-@@ -25,6 +25,7 @@
- #include <cstddef>
+diff -Naur vapoursynth-R51.old/src/filters/misc/miscfilters.cpp vapoursynth-R51/src/filters/misc/miscfilters.cpp
+--- vapoursynth-R51.old/src/filters/misc/miscfilters.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/misc/miscfilters.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
#include <memory>
+ #include <stdexcept>
#include <vector>
+#include <limits>
#include <VapourSynth.h>
#include <VSHelper.h>
#include "../src/core/filtersharedcpp.h"
-diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
-index 5fdc6b2..2507119 100644
---- a/src/filters/removegrain/clense.cpp
-+++ b/src/filters/removegrain/clense.cpp
-@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+diff -Naur vapoursynth-R51.old/src/filters/removegrain/clense.cpp vapoursynth-R51/src/filters/removegrain/clense.cpp
+--- vapoursynth-R51.old/src/filters/removegrain/clense.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/removegrain/clense.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
*/
#include "shared.h"
diff --git a/vapoursynth-python38.patch b/vapoursynth-python38.patch
deleted file mode 100644
index 94ba351..0000000
--- a/vapoursynth-python38.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11 Mon Sep 17 00:00:00 2001
-From: cantabile <cantabile.desu(a)gmail.com>
-Date: Sun, 26 Jan 2020 00:00:22 +0200
-Subject: [PATCH] Fix compilation with Python 3.8.
-
-Fixes https://github.com/vapoursynth/vapoursynth/issues/518.
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1d1b05fc..7dcde996 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,13 @@ AS_IF(
- [
- AM_PATH_PYTHON([3])
-
-- PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-
- AC_CONFIG_FILES([pc/vapoursynth-script.pc])
- ]
-@@ -292,7 +298,15 @@ AS_IF(
-
- AS_IF(
- [test -z "$PYTHON3_LIBS"],
-- [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])]
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-+ ]
- )
-
- AS_CASE(
diff --git a/vapoursynth-version-info.patch b/vapoursynth-version-info.patch
index 0ad2ed7..e7d1725 100644
--- a/vapoursynth-version-info.patch
+++ b/vapoursynth-version-info.patch
@@ -1,12 +1,12 @@
-diff -U3 vapoursynth-R48.orig/Makefile.am vapoursynth-R48/Makefile.am
---- vapoursynth-R48.orig/Makefile.am 2019-10-25 09:16:07.000000000 +0300
-+++ vapoursynth-R48/Makefile.am 2019-12-01 01:28:57.161837465 +0300
-@@ -89,7 +89,7 @@
+diff -Naur vapoursynth-R51.old/Makefile.am vapoursynth-R51/Makefile.am
+--- vapoursynth-R51.old/Makefile.am 2021-03-23 14:27:12.519657875 +0100
++++ vapoursynth-R51/Makefile.am 2021-03-23 14:27:19.806783602 +0100
+@@ -79,7 +79,7 @@
pkgconfig_DATA += pc/vapoursynth.pc
-libvapoursynth_la_LDFLAGS = -no-undefined -avoid-version
+libvapoursynth_la_LDFLAGS = -no-undefined -version-info $(PACKAGE_VERSION)
libvapoursynth_la_CPPFLAGS = $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
- libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la libvapoursynth_avx2.la
+ libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
diff --git a/vapoursynth.spec b/vapoursynth.spec
index ba22267..ba4d5dd 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -1,22 +1,19 @@
#global _with_tests 1
-#global _with_ffmpeg 1
+#global _with_subtitles 1
#global _with_ImageMagick 1
Name: vapoursynth
-Version: 48
-Release: 11%{?dist}
+Version: 51
+Release: 1%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
-Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
-Patch2: %{name}-gcc11.patch
+Patch1: %{name}-gcc11.patch
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -38,7 +35,7 @@ BuildRequires: python3dist(pytest)
BuildRequires: pkgconfig(Magick++) >= 7.0
}
-%{?_with_ffmpeg:
+%{?_with_subtitles:
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -109,7 +106,7 @@ autoreconf -vif
--enable-morpho \
--enable-ocr \
--enable-removegrain \
- --%{?_with_ffmpeg:enable}%{!?_with_ffmpeg:disable}-subtext \
+ --%{?_with_subtitles:enable}%{!?_with_subtitles:disable}-subtext \
--enable-vinverse \
--enable-vivtc \
@@ -136,7 +133,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%files libs
%doc ChangeLog
-%license COPYING.LGPLv2.1 ofl.txt
+%license COPYING.LESSER
%dir %{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}-script.so.*
@@ -160,6 +157,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Tue Mar 23 2021 Simone Caronni <negativo17(a)gmail.com> - 51-1
+- Update to R51.
+- Allow building for other archs beside x86.
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 1 month
- 1
- 0
Architecture specific change in rpms/vapoursynth.git
by githook-noreply＠fedoraproject.org
The package rpms/vapoursynth.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vapoursynth.git/commit/?id=5cfca1....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit cdbbdd5b25b02632a8fa217cda4a3779b8e1ce4b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:31:00 2021 +0100
Update sources
diff --git a/.gitignore b/.gitignore
index 6c565b5..be14818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vapoursynth-R48.tar.gz
+/vapoursynth-R51.tar.gz
diff --git a/sources b/sources
index 2dd9c19..c687eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vapoursynth-R48.tar.gz) = 0d151dd384c97f103f8d96ea083909001e0b690af4362c64685c04efde874f4a8ff038b5149beb40688d6f9e0a4cc86d9618b6cc8a3066a270d81c2b6f1d068e
+SHA512 (vapoursynth-R51.tar.gz) = feb218aa309e538a32054b4fdeaf291e5c817e1b49bd482cf9dfc6c17d055c367dc27f80863770ae3333a4d115c026ad47609ed70857d89c22ff16f5cc6d5292
commit 5cfca1ca8fb06df4140664c38f13a4d2ae7ee844
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:10:05 2021 +0100
Update to R51, allow building for other archs beside x86
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
index fe8b2d8..29e4722 100644
--- a/vapoursynth-gcc11.patch
+++ b/vapoursynth-gcc11.patch
@@ -1,7 +1,6 @@
-diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
-index 8e6f154..1971f18 100644
---- a/src/core/exprfilter.cpp
-+++ b/src/core/exprfilter.cpp
+diff -Naur vapoursynth-R51.old/src/core/exprfilter.cpp vapoursynth-R51/src/core/exprfilter.cpp
+--- vapoursynth-R51.old/src/core/exprfilter.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/exprfilter.cpp 2021-03-23 14:36:17.148054372 +0100
@@ -32,6 +32,7 @@
#include <unordered_map>
#include <unordered_set>
@@ -10,10 +9,9 @@ index 8e6f154..1971f18 100644
#include "VapourSynth.h"
#include "VSHelper.h"
#include "cpufeatures.h"
-diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
-index 613d98f..327512c 100644
---- a/src/core/genericfilters.cpp
-+++ b/src/core/genericfilters.cpp
+diff -Naur vapoursynth-R51.old/src/core/genericfilters.cpp vapoursynth-R51/src/core/genericfilters.cpp
+--- vapoursynth-R51.old/src/core/genericfilters.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/genericfilters.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -28,6 +28,7 @@
#include <array>
#include <memory>
@@ -22,10 +20,9 @@ index 613d98f..327512c 100644
#include <VapourSynth.h>
#include <VSHelper.h>
#include "cpufeatures.h"
-diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
-index f4477bd..c00c619 100644
---- a/src/core/kernel/generic.cpp
-+++ b/src/core/kernel/generic.cpp
+diff -Naur vapoursynth-R51.old/src/core/kernel/generic.cpp vapoursynth-R51/src/core/kernel/generic.cpp
+--- vapoursynth-R51.old/src/core/kernel/generic.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/kernel/generic.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -22,6 +22,7 @@
#include <array>
#include <cmath>
@@ -34,23 +31,21 @@ index f4477bd..c00c619 100644
#include <type_traits>
#include "generic.h"
-diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
-index b4a727a..8931cbb 100644
---- a/src/filters/misc/miscfilters.cpp
-+++ b/src/filters/misc/miscfilters.cpp
-@@ -25,6 +25,7 @@
- #include <cstddef>
+diff -Naur vapoursynth-R51.old/src/filters/misc/miscfilters.cpp vapoursynth-R51/src/filters/misc/miscfilters.cpp
+--- vapoursynth-R51.old/src/filters/misc/miscfilters.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/misc/miscfilters.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
#include <memory>
+ #include <stdexcept>
#include <vector>
+#include <limits>
#include <VapourSynth.h>
#include <VSHelper.h>
#include "../src/core/filtersharedcpp.h"
-diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
-index 5fdc6b2..2507119 100644
---- a/src/filters/removegrain/clense.cpp
-+++ b/src/filters/removegrain/clense.cpp
-@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+diff -Naur vapoursynth-R51.old/src/filters/removegrain/clense.cpp vapoursynth-R51/src/filters/removegrain/clense.cpp
+--- vapoursynth-R51.old/src/filters/removegrain/clense.cpp 2021-03-23 14:34:50.276555570 +0100
++++ vapoursynth-R51/src/filters/removegrain/clense.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
*/
#include "shared.h"
diff --git a/vapoursynth-python38.patch b/vapoursynth-python38.patch
deleted file mode 100644
index 94ba351..0000000
--- a/vapoursynth-python38.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11 Mon Sep 17 00:00:00 2001
-From: cantabile <cantabile.desu(a)gmail.com>
-Date: Sun, 26 Jan 2020 00:00:22 +0200
-Subject: [PATCH] Fix compilation with Python 3.8.
-
-Fixes https://github.com/vapoursynth/vapoursynth/issues/518.
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1d1b05fc..7dcde996 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,13 @@ AS_IF(
- [
- AM_PATH_PYTHON([3])
-
-- PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-
- AC_CONFIG_FILES([pc/vapoursynth-script.pc])
- ]
-@@ -292,7 +298,15 @@ AS_IF(
-
- AS_IF(
- [test -z "$PYTHON3_LIBS"],
-- [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])]
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-+ ]
- )
-
- AS_CASE(
diff --git a/vapoursynth-version-info.patch b/vapoursynth-version-info.patch
index 0ad2ed7..e7d1725 100644
--- a/vapoursynth-version-info.patch
+++ b/vapoursynth-version-info.patch
@@ -1,12 +1,12 @@
-diff -U3 vapoursynth-R48.orig/Makefile.am vapoursynth-R48/Makefile.am
---- vapoursynth-R48.orig/Makefile.am 2019-10-25 09:16:07.000000000 +0300
-+++ vapoursynth-R48/Makefile.am 2019-12-01 01:28:57.161837465 +0300
-@@ -89,7 +89,7 @@
+diff -Naur vapoursynth-R51.old/Makefile.am vapoursynth-R51/Makefile.am
+--- vapoursynth-R51.old/Makefile.am 2021-03-23 14:27:12.519657875 +0100
++++ vapoursynth-R51/Makefile.am 2021-03-23 14:27:19.806783602 +0100
+@@ -79,7 +79,7 @@
pkgconfig_DATA += pc/vapoursynth.pc
-libvapoursynth_la_LDFLAGS = -no-undefined -avoid-version
+libvapoursynth_la_LDFLAGS = -no-undefined -version-info $(PACKAGE_VERSION)
libvapoursynth_la_CPPFLAGS = $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
- libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la libvapoursynth_avx2.la
+ libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
diff --git a/vapoursynth.spec b/vapoursynth.spec
index ba22267..ba4d5dd 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -1,22 +1,19 @@
#global _with_tests 1
-#global _with_ffmpeg 1
+#global _with_subtitles 1
#global _with_ImageMagick 1
Name: vapoursynth
-Version: 48
-Release: 11%{?dist}
+Version: 51
+Release: 1%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
-Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
-Patch2: %{name}-gcc11.patch
+Patch1: %{name}-gcc11.patch
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -38,7 +35,7 @@ BuildRequires: python3dist(pytest)
BuildRequires: pkgconfig(Magick++) >= 7.0
}
-%{?_with_ffmpeg:
+%{?_with_subtitles:
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -109,7 +106,7 @@ autoreconf -vif
--enable-morpho \
--enable-ocr \
--enable-removegrain \
- --%{?_with_ffmpeg:enable}%{!?_with_ffmpeg:disable}-subtext \
+ --%{?_with_subtitles:enable}%{!?_with_subtitles:disable}-subtext \
--enable-vinverse \
--enable-vivtc \
@@ -136,7 +133,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%files libs
%doc ChangeLog
-%license COPYING.LGPLv2.1 ofl.txt
+%license COPYING.LESSER
%dir %{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}-script.so.*
@@ -160,6 +157,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Tue Mar 23 2021 Simone Caronni <negativo17(a)gmail.com> - 51-1
+- Update to R51.
+- Allow building for other archs beside x86.
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit be02be55074ba9c68aff93ffdea0e8ca6a03c7fc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 22:54:56 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vapoursynth.spec b/vapoursynth.spec
index 23a9660..ba22267 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -160,6 +160,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sat Oct 17 2020 Jeff Law <law(a)redhat.com> - 48-10
- Fix missing #include for gcc-11
commit 1991e0f599c93577b5182d392c7a77b1d1542b2f
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Sat Jan 9 00:34:55 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/vapoursynth.spec b/vapoursynth.spec
index e3f047a..23a9660 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -16,6 +16,7 @@ Patch2: %{name}-gcc11.patch
ExclusiveArch: %{ix86} x86_64
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
commit 92baa573a3b302bdd8becda159e73000b03ee948
Author: Jeff Law <law(a)redhat.com>
Date: Sat Oct 17 11:22:29 2020 -0600
Fix missing #includes for gcc-11
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
new file mode 100644
index 0000000..fe8b2d8
--- /dev/null
+++ b/vapoursynth-gcc11.patch
@@ -0,0 +1,60 @@
+diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
+index 8e6f154..1971f18 100644
+--- a/src/core/exprfilter.cpp
++++ b/src/core/exprfilter.cpp
+@@ -32,6 +32,7 @@
+ #include <unordered_map>
+ #include <unordered_set>
+ #include <vector>
++#include <limits>
+ #include "VapourSynth.h"
+ #include "VSHelper.h"
+ #include "cpufeatures.h"
+diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
+index 613d98f..327512c 100644
+--- a/src/core/genericfilters.cpp
++++ b/src/core/genericfilters.cpp
+@@ -28,6 +28,7 @@
+ #include <array>
+ #include <memory>
+ #include <vector>
++#include <limits>
+ #include <VapourSynth.h>
+ #include <VSHelper.h>
+ #include "cpufeatures.h"
+diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
+index f4477bd..c00c619 100644
+--- a/src/core/kernel/generic.cpp
++++ b/src/core/kernel/generic.cpp
+@@ -22,6 +22,7 @@
+ #include <array>
+ #include <cmath>
+ #include <cstdint>
++#include <limits>
+ #include <type_traits>
+ #include "generic.h"
+
+diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
+index b4a727a..8931cbb 100644
+--- a/src/filters/misc/miscfilters.cpp
++++ b/src/filters/misc/miscfilters.cpp
+@@ -25,6 +25,7 @@
+ #include <cstddef>
+ #include <memory>
+ #include <vector>
++#include <limits>
+ #include <VapourSynth.h>
+ #include <VSHelper.h>
+ #include "../src/core/filtersharedcpp.h"
+diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
+index 5fdc6b2..2507119 100644
+--- a/src/filters/removegrain/clense.cpp
++++ b/src/filters/removegrain/clense.cpp
+@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ #include "shared.h"
++#include <limits>
+
+ #define CLENSE_RETERROR(x) do { vsapi->setError(out, (x)); vsapi->freeNode(d.cnode); vsapi->freeNode(d.pnode); vsapi->freeNode(d.nnode); return; } while (0)
+ #define CLAMP(value, lower, upper) do { if (value < lower) value = lower; else if (value > upper) value = upper; } while(0)
diff --git a/vapoursynth.spec b/vapoursynth.spec
index f89afdb..e3f047a 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -12,6 +12,7 @@ URL: http://www.vapoursynth.com
Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
+Patch2: %{name}-gcc11.patch
ExclusiveArch: %{ix86} x86_64
@@ -158,6 +159,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Sat Oct 17 2020 Jeff Law <law(a)redhat.com> - 48-10
+- Fix missing #include for gcc-11
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 32e61f72b36786882c78cfd390073db0cb80bad9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 13:33:21 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vapoursynth.spec b/vapoursynth.spec
index 20a637f..f89afdb 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -158,6 +158,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 48-8
- Rebuilt for Python 3.9
commit 2648d175fa205a30129eb3afa142bf403af99186
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 03:54:16 2020 +0200
Rebuilt for Python 3.9
diff --git a/vapoursynth.spec b/vapoursynth.spec
index 205b05f..20a637f 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -4,7 +4,7 @@
Name: vapoursynth
Version: 48
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL: http://www.vapoursynth.com
@@ -158,6 +158,9 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 48-8
+- Rebuilt for Python 3.9
+
* Sat Mar 07 2020 Simone Caronni <negativo17(a)gmail.com> - 48-7
- Fix broken dependency.
3 years, 1 month
- 1
- 0