[VirtualBox-kmod] Fixes for kernel 4.18
by Sérgio M. Basto
commit 0e55d6985a3a01eb42c294a58b17363fcef356b1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 4 05:36:37 2018 +0100
Fixes for kernel 4.18
VirtualBox-kmod.spec | 9 ++++++---
kernel-4.18.patch | 26 ++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 425b1c4..9d1c149 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -41,7 +41,7 @@
Name: VirtualBox-kmod
Version: 5.2.18
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -51,7 +51,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
Source1: VirtualBox-kmod-excludekernel-filter.txt
Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
-#Patch1: fixes_for_4.15.v2.patch
+Patch1: kernel-4.18.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -75,7 +75,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-#patch1 -p2 -b .kernel_4.15
+%patch1 -p2 -b .kernel_4.18
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
@@ -140,6 +140,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Tue Sep 04 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.18-2
+- Fixes for kernel 4.18
+
* Mon Aug 27 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.18-1
- Update to 5.2.18
diff --git a/kernel-4.18.patch b/kernel-4.18.patch
new file mode 100644
index 0000000..0fba836
--- /dev/null
+++ b/kernel-4.18.patch
@@ -0,0 +1,26 @@
+--- ./VirtualBox-kmod-5.2.18/vboxsf/utils.c.orig 2018-09-04 05:22:27.815143183 +0100
++++ ./VirtualBox-kmod-5.2.18/vboxsf/utils.c 2018-09-04 05:23:00.318486258 +0100
+@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM
+ RTTimeSpecSetNano(ts, t);
+ }
+ #else /* >= 2.6.0 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
+ static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
++#else
++static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
++#endif
+ {
+ int64_t t = RTTimeSpecGetNano(ts);
+ int64_t nsec;
+@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc
+ tv->tv_nsec = nsec;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
+ static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
++#else
++static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
++#endif
+ {
+ int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
+ RTTimeSpecSetNano(ts, t);
6 years, 2 months
[openshot] small typo
by Frank R Dana
commit 7bd3dd5f42bbd6b1c524c46a844815277a01305e
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Sep 4 00:27:03 2018 -0400
small typo
openshot-qt.appdata.xml | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/openshot-qt.appdata.xml b/openshot-qt.appdata.xml
index 3f5b56f..03ca16f 100644
--- a/openshot-qt.appdata.xml
+++ b/openshot-qt.appdata.xml
@@ -8,26 +8,30 @@
<project_license>GPL-3.0-or-later</project_license>
<name>OpenShot Video Editor</name>
<developer_name>OpenShot Studios, LLC</developer_name>
- <summary>Create and edit amazing videos and movies</summary>
+ <summary>
+ An easy to use, quick to learn, and surprisingly powerful video editor
+ </summary>
<description>
- <p>
-OpenShot Video Editor is a free, open-source, non-linear video editor. It
-can create and edit videos and movies using many popular video, audio,
-image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod,
-Xbox, and many more common formats!
- </p>
- <p>
-Features include:
-* Multiple tracks (layers)
-* Compositing, image overlays, and watermarks
-* Audio mixing and editing
-* Support for image sequences (rotoscoping)
-* Key-frame animation
-* Video effects (chroma-key)
-* Transitions (lumas and masks)
-* Titles with integrated editor and templates
-* 3D animation (titles and effects)
- </p>
+ <p>
+ OpenShot Video Editor is a free, open-source, non-linear video editor. It
+ can create and edit videos and movies using many popular video, audio,
+ image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod,
+ Xbox, and more!
+ </p>
+ <p>
+ Features include:
+ <ul>
+ <li>Multiple tracks (layers)</li>
+ <li>Compositing, image overlays, and watermarks</li>
+ <li>Audio mixing and editing</li>
+ <li>Support for image sequences (rotoscoping)</li>
+ <li>Key-frame animation</li>
+ <li>Video effects (chroma-key)</li>
+ <li>Transitions (lumas and masks)</li>
+ <li>Titles with integrated editor and templates</li>
+ <li>3D animation (titles and effects)</li>
+ </ul>
+ </p>
</description>
<provides>
<binary>openshot-qt</binary>
6 years, 2 months
[openshot] Update appdata file per upstream
by Frank R Dana
commit 1ce8138975383e82c17977f1185ebbf43b1cb39c
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 3 22:41:03 2018 -0400
Update appdata file per upstream
OpenShot will be shipping an appdata file with their next release, so I
reconciled ours with theirs. I'll propose the diffs back to upstream too,
so hopefully the dist version will be usable with minimal changes.
openshot-qt.appdata.xml | 50 +++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 42 insertions(+), 8 deletions(-)
---
diff --git a/openshot-qt.appdata.xml b/openshot-qt.appdata.xml
index 1043e4d..3f5b56f 100644
--- a/openshot-qt.appdata.xml
+++ b/openshot-qt.appdata.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
- <id>openshot-qt.desktop</id>
+<component type="desktop-application">
+ <id>openshot-qt</id>
<pkgname>openshot</pkgname>
+ <update_contact>openshot-owner(a)rpmfusion.org</update_contact>
+ <launchable type="desktop-id">openshot-qt.desktop</launchable>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0-or-later</project_license>
<name>OpenShot Video Editor</name>
+ <developer_name>OpenShot Studios, LLC</developer_name>
<summary>Create and edit amazing videos and movies</summary>
<description>
<p>
@@ -23,18 +28,47 @@ Features include:
* Titles with integrated editor and templates
* 3D animation (titles and effects)
</p>
-</description>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0-or-later</project_license>
- <url type="bugtracker">https://bugs.launchpad.net/openshot</url>
+ </description>
+ <provides>
+ <binary>openshot-qt</binary>
+ </provides>
<url type="donation">https://www.openshot.org/donate</url>
<url type="help">https://www.openshot.org/user-guide</url>
<url type="homepage">https://www.openshot.org</url>
+ <url type="bugtracker">https://github.com/OpenShot/openshot-qt/issues</url>
<project_group>none</project_group>
<screenshots>
<screenshot type="default">
- <image height="637" width="975">https://www.openshot.org/static/files/user-guide/_images/ui-example.jpg</image>
+ <image height="637" width="975">https://www.openshot.org/static/img/gallery/ui-example.jpg</image>
+ </screenshot>
+ <screenshot>
+ <image height="555" width="780">https://www.openshot.org/static/img/gallery/title-editor.jpg</image>
</screenshot>
</screenshots>
- <update_contact>openshot-owner(a)rpmfusion.org</update_contact>
+ <content_rating type="oars-1.0">
+ <content_attribute id="violence-cartoon">none</content_attribute>
+ <content_attribute id="violence-fantasy">none</content_attribute>
+ <content_attribute id="violence-realistic">none</content_attribute>
+ <content_attribute id="violence-bloodshed">none</content_attribute>
+ <content_attribute id="violence-sexual">none</content_attribute>
+ <content_attribute id="drugs-alcohol">none</content_attribute>
+ <content_attribute id="drugs-narcotics">none</content_attribute>
+ <content_attribute id="drugs-tobacco">none</content_attribute>
+ <content_attribute id="sex-nudity">none</content_attribute>
+ <content_attribute id="sex-themes">none</content_attribute>
+ <content_attribute id="language-profanity">none</content_attribute>
+ <content_attribute id="language-humor">none</content_attribute>
+ <content_attribute id="language-discrimination">none</content_attribute>
+ <content_attribute id="social-chat">none</content_attribute>
+ <content_attribute id="social-info">none</content_attribute>
+ <content_attribute id="social-audio">none</content_attribute>
+ <content_attribute id="social-location">none</content_attribute>
+ <content_attribute id="social-contacts">none</content_attribute>
+ <content_attribute id="money-purchasing">none</content_attribute>
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+ <releases>
+ <release version="2.4.2" date="2018-06-30"/>
+ <release version="2.4.1" date="2017-11-12"/>
+ </releases>
</component>
6 years, 2 months
[freetype-freeworld/f29] (3 commits) ...Uploaded sources
by Sérgio M. Basto
Summary of changes:
550961f... Update to 2.9.1 to sync with Fedora (rhbz #1575687) patch0 (*)
cba583b... delete old patches (*)
60eaefa... Uploaded sources (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[freetype-freeworld] Uploaded sources
by Sérgio M. Basto
commit 60eaefa127c986bfbec59d51dc5361522419e227
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 4 00:17:27 2018 +0100
Uploaded sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 3db64b5..685f324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ freetype-2.6.tar.bz2
/freetype-2.7.tar.bz2
/freetype-2.7.1.tar.bz2
/freetype-2.8.tar.bz2
+/freetype-2.9.1.tar.bz2
diff --git a/sources b/sources
index 0a15c28..552c003 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2
+60ef7d8160cd4bf8cb118ee9d65367ca freetype-2.9.1.tar.bz2
6 years, 2 months
[freetype-freeworld] delete old patches
by Sérgio M. Basto
commit cba583b308ac29f7961450d152e9fad94e5ab369
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 4 00:12:46 2018 +0100
delete old patches
0077-truetype-Fix-loading-of-named-instances.patch | 67 ----------------------
...uetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch | 45 ---------------
freetype-2.7.1-protect-flex-handling.patch | 47 ---------------
freetype-2.7.1-safety-guard.patch | 36 ------------
freetype-2.8-getvariation.patch | 39 -------------
freetype-2.8-loop-counter.patch | 36 ------------
freetype-2.8-pcf-encoding.patch | 58 -------------------
7 files changed, 328 deletions(-)
6 years, 2 months
[freetype-freeworld] Update to 2.9.1 to sync with Fedora (rhbz #1575687) patch0 rebased patch1 rebased patch4 upstreamed
by Sérgio M. Basto
commit 550961fe92a37430acca749577b87f613505ea48
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 4 00:08:34 2018 +0100
Update to 2.9.1 to sync with Fedora (rhbz #1575687)
patch0 rebased
patch1 rebased
patch4 upstreamed
patch5 upstreamed
patch6 upstreamed but with diffrences
patch7 upstreamed
patch9 upstreamed
add BuildRequires: gcc
Switch to %ldconfig_scriptlets
Add patch5 from Fedora
freetype-2.2.1-enable-valid.patch | 12 ++---
freetype-2.3.0-enable-spr.patch | 10 ++--
freetype-2.9-ftsmooth.patch | 101 ++++++++++++++++++++++++++++++++++++++
freetype-freeworld.spec | 45 +++++++----------
4 files changed, 131 insertions(+), 37 deletions(-)
---
diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch
index 21d80da..4f595a6 100644
--- a/freetype-2.2.1-enable-valid.patch
+++ b/freetype-2.2.1-enable-valid.patch
@@ -1,7 +1,7 @@
---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
+--- ./modules.cfg.orig 2018-04-22 10:41:36.000000000 +0100
++++ ./modules.cfg 2018-09-03 23:20:13.727027428 +0100
+@@ -120,7 +120,7 @@ AUX_MODULES += cache
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
@@ -9,8 +9,8 @@
# Support for streams compressed with gzip (files with suffix .gz).
#
-@@ -124,7 +124,7 @@
- # OpenType table validation. Needs ftotval.c below.
+@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # OpenType table validation. Needs `ftotval.c' below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch
index 8432e28..8712fd8 100644
--- a/freetype-2.3.0-enable-spr.patch
+++ b/freetype-2.3.0-enable-spr.patch
@@ -1,8 +1,8 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
+--- ./include/freetype/config/ftoption.h.orig 2018-04-22 10:41:36.000000000 +0100
++++ ./include/freetype/config/ftoption.h 2018-09-03 23:16:41.840579577 +0100
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
+ /* rendering technology that produces excellent output without LCD */
+ /* filtering. */
/* */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
diff --git a/freetype-2.9-ftsmooth.patch b/freetype-2.9-ftsmooth.patch
new file mode 100644
index 0000000..2735bd5
--- /dev/null
+++ b/freetype-2.9-ftsmooth.patch
@@ -0,0 +1,101 @@
+--- a/src/smooth/ftsmooth.c
++++ b/src/smooth/ftsmooth.c
+@@ -232,39 +232,13 @@
+ FT_UInt i, j;
+
+ unsigned int height = bitmap->rows;
+- unsigned int width = bitmap->width;
++ unsigned int width = bitmap->width / 3;
+ int pitch = bitmap->pitch;
+
+-
+- /* Render 3 separate monochrome bitmaps, shifting the outline */
+- /* by 1/3 pixel. */
+- width /= 3;
+-
+- bitmap->buffer += width;
+-
+- error = render->raster_render( render->raster, ¶ms );
+- if ( error )
+- goto Exit;
+-
+- FT_Outline_Translate( outline, -21, 0 );
+- x_shift -= 21;
+- bitmap->buffer += width;
+-
+ error = render->raster_render( render->raster, ¶ms );
+ if ( error )
+ goto Exit;
+
+- FT_Outline_Translate( outline, 42, 0 );
+- x_shift += 42;
+- bitmap->buffer -= 2 * width;
+-
+- error = render->raster_render( render->raster, ¶ms );
+- if ( error )
+- goto Exit;
+-
+- /* XXX: Rearrange the bytes according to FT_PIXEL_MODE_LCD. */
+- /* XXX: It is more efficient to render every third byte above. */
+-
+ if ( FT_ALLOC( temp, (FT_ULong)pitch ) )
+ goto Exit;
+
+@@ -272,11 +246,7 @@
+ {
+ line = bitmap->buffer + i * (FT_ULong)pitch;
+ for ( j = 0; j < width; j++ )
+- {
+- temp[3 * j ] = line[j];
+- temp[3 * j + 1] = line[j + width];
+- temp[3 * j + 2] = line[j + width + width];
+- }
++ temp[3 * j] = temp[3 * j + 1] = temp[3 * j + 2] = line[j];
+ FT_MEM_COPY( line, temp, pitch );
+ }
+
+@@ -284,35 +254,23 @@
+ }
+ else if ( vmul ) /* lcd_v */
+ {
+- int pitch = bitmap->pitch;
+-
++ FT_Byte* line;
++ FT_UInt i;
++ int original_pitch = bitmap->pitch;
+
+- /* Render 3 separate monochrome bitmaps, shifting the outline */
+- /* by 1/3 pixel. Triple the pitch to render on each third row. */
+ bitmap->pitch *= 3;
+ bitmap->rows /= 3;
+
+- bitmap->buffer += pitch;
+-
+- error = render->raster_render( render->raster, ¶ms );
+- if ( error )
+- goto Exit;
+-
+- FT_Outline_Translate( outline, 0, 21 );
+- y_shift += 21;
+- bitmap->buffer += pitch;
+-
+ error = render->raster_render( render->raster, ¶ms );
+ if ( error )
+ goto Exit;
+
+- FT_Outline_Translate( outline, 0, -42 );
+- y_shift -= 42;
+- bitmap->buffer -= 2 * pitch;
+-
+- error = render->raster_render( render->raster, ¶ms );
+- if ( error )
+- goto Exit;
++ for ( i = 0; i < bitmap->rows; i++ )
++ {
++ line = bitmap->buffer + i * bitmap->pitch;
++ FT_MEM_COPY( line + original_pitch, line, bitmap->width );
++ FT_MEM_COPY( line + 2 * original_pitch, line, bitmap->width );
++ }
+
+ bitmap->pitch /= 3;
+ bitmap->rows *= 3;
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 2f3673c..12346a5 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
-Version: 2.8
-Release: 8%{?dist}
+Version: 2.9.1
+Release: 1%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -11,25 +11,13 @@ Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
Patch1: freetype-2.2.1-enable-valid.patch
-# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
-# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
-Patch4: freetype-2.8-pcf-encoding.patch
-
-# Adjust loop counter maximum for TrueType fonts
-# https://bugzilla.redhat.com/show_bug.cgi?id=1456585
-Patch5: freetype-2.8-loop-counter.patch
-
-Patch6: 0077-truetype-Fix-loading-of-named-instances.patch
-Patch7: 0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
-
-## Security fixes:
-# CVE-2018-6942 NULL pointer dereference in the Ins_GETVARIATION() function
-Patch9: freetype-2.8-getvariation.patch
+Patch5: freetype-2.9-ftsmooth.patch
Provides: freetype-bytecode
Provides: freetype-subpixel
Requires: /etc/ld.so.conf.d
+BuildRequires: gcc
BuildRequires: libX11-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
@@ -60,13 +48,7 @@ It transparently overrides the system library using ld.so.conf.d.
%patch1 -p1 -b .enable-valid
-%patch4 -p1 -b .pcf-encoding
-%patch5 -p1 -b .loop-counter
-%patch6 -p1 -b .named-instances
-%patch7 -p1 -b .named-instances2
-
-# Security fixes:
-%patch9 -p1 -b .getvariation
+%patch5 -p1 -b .ftsmooth
%build
%configure --disable-static \
@@ -99,9 +81,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{name}" \
>%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%{_libdir}/%{name}
@@ -110,6 +90,19 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Mon Sep 03 2018 Sérgio Basto <sergio(a)serjux.com> - 2.9.1-1
+- Update to 2.9.1 to sync with Fedora (rhbz #1575687)
+- patch0 rebased
+- patch1 rebased
+- patch4 upstreamed
+- patch5 upstreamed
+- patch6 upstreamed but with diffrences
+- patch7 upstreamed
+- patch9 upstreamed
+- add BuildRequires: gcc
+- Switch to %%ldconfig_scriptlets
+- Add patch5 from Fedora
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
6 years, 2 months
