Commit c10f2d9b authored by Leo's avatar Leo

Remove stale patches from testing

parent 47d62840
--- a/checkpolicy.c
+++ b/checkpolicy.c
@@ -71,13 +71,11 @@
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
#include <sys/mman.h>
-#ifdef __APPLE__
#include <ctype.h>
-#endif
#include <sepol/module_to_cil.h>
#include <sepol/policydb/policydb.h>
#include <sepol/policydb/services.h>
#include <sepol/policydb/conditional.h>
diff --git a/vendor/github.com/safchain/ethtool/ethtool.go b/vendor/github.com/safchain/ethtool/ethtool.go
index 1f8828f..98387e6 100644
--- a/vendor/github.com/safchain/ethtool/ethtool.go
+++ b/vendor/github.com/safchain/ethtool/ethtool.go
@@ -202,9 +202,9 @@ func (e *Ethtool) Close() {
}
func NewEthtool() (*Ethtool, error) {
- fd, _, err := syscall.RawSyscall(syscall.SYS_SOCKET, syscall.AF_INET, syscall.SOCK_DGRAM, syscall.IPPROTO_IP)
- if err != 0 {
- return nil, syscall.Errno(err)
+ fd, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_DGRAM, syscall.IPPROTO_IP)
+ if err != nil {
+ return nil, err
}
return &Ethtool{
From ac17ff1e4400b80ce0be64911bf1c4f1ac548c34 Mon Sep 17 00:00:00 2001
From: Shiz <hi@shiz.me>
Date: Sat, 29 Jun 2019 02:21:47 +0200
Subject: [PATCH] Core: add missing X11 includes
---
Source/Core/DolphinNoGUI/PlatformX11.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp
index af8993a4a58..dfa1c0729d3 100644
--- a/Source/Core/DolphinNoGUI/PlatformX11.cpp
+++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp
@@ -18,6 +18,7 @@
#include <X11/Xatom.h>
#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include <X11/keysym.h>
#include "UICommon/X11Utils.h"
#include "VideoCommon/RenderBase.h"
From 7bb9f502cf4505d7f30b8f0a3303e05464fafe44 Mon Sep 17 00:00:00 2001
From: Shiz <hi@shiz.me>
Date: Sat, 29 Jun 2019 02:31:24 +0200
Subject: [PATCH] Core/UICommon: fix compilation without X RandR support
---
Source/Core/UICommon/UICommon.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index 935d07b043f..27fe62307d1 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -367,16 +367,15 @@ bool TriggerSTMPowerEvent()
return true;
}
-#if defined(HAVE_XRANDR) && HAVE_X11
-void EnableScreenSaver(Window win, bool enable)
-#else
+#if !defined(HAVE_XRANDR) || !HAVE_XRANDR
void EnableScreenSaver(bool enable)
-#endif
+{
+#else
+void EnableScreenSaver(Window win, bool enable)
{
// Inhibit the screensaver. Depending on the operating system this may also
// disable low-power states and/or screen dimming.
-#if defined(HAVE_X11) && HAVE_X11
if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER))
{
X11Utils::InhibitScreensaver(win, !enable);
diff -up fatresize-1.0.2/configure.ac.orig fatresize-1.0.2/configure.ac
--- fatresize-1.0.2/configure.ac.orig 2005-09-20 10:30:35.000000000 +0200
+++ fatresize-1.0.2/configure.ac 2012-12-17 23:33:06.238862845 +0100
@@ -29,8 +29,8 @@ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac
dnl libparted
# hack
LIBS="$LIBS -ldl"
-PARTED_CHECK_LIBPARTED(1.6.0, ,
- [AC_MSG_ERROR([*** libparted >= 1.6.0 not installed - please install first ***])])
+AC_CHECK_LIB(parted, ped_malloc, [], AC_MSG_ERROR([*** libparted >= 3.1.0 not installed - please install first ***]))
+AC_CHECK_LIB(parted-fs-resize, ped_file_system_open, [], AC_MSG_ERROR([*** libparted-fs-resize >= 3.1.0 not installed - please install first ***]))
AC_SUBST(PARTED_LIBS)
diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
--- fatresize-1.0.2/fatresize.c.orig 2005-09-20 10:29:08.000000000 +0200
+++ fatresize-1.0.2/fatresize.c 2012-12-18 00:07:00.000000000 +0100
@@ -217,7 +217,7 @@ fatresize_handler(PedException *ex)
static int
snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
{
- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
if (!ped_geometry_test_sector_inside(range, new_sector))
return 0;
@@ -281,7 +281,7 @@ snap_to_boundaries (PedGeometry* new_geo
end_part->geom.end, end_part->geom.start - 1, -1);
}
- PED_ASSERT (start <= end, return);
+ PED_ASSERT (start <= end);
ped_geometry_set (new_geom, start, end - start + 1);
}
diff -up fatresize-1.0.2/fatresize.c.orig fatresize-1.0.2/fatresize.c
--- fatresize-1.0.2/fatresize.c.orig 2005-09-20 10:29:08.000000000 +0200
+++ fatresize-1.0.2/fatresize.c 2012-12-18 00:19:45.061745003 +0100
@@ -320,11 +320,11 @@ partition_warn_busy(PedPartition* part)
("Partition %s is being used. You must unmount it "
"before you modify it with Parted."),
path);
- ped_free(path);
+ free(path);
return 0;
}
- ped_free(path);
+ free(path);
return 1;
}
@@ -507,8 +507,8 @@ main(int argc, char **argv)
}
else if (!ped_unit_parse(def_str, dev, &end, &range_end))
return 1;
- ped_free(old_str);
- ped_free(def_str);
+ free(old_str);
+ free(def_str);
printd(3, "ped_geometry_duplicate()\n");
old_geom = ped_geometry_duplicate(&part->geom);
From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Tue, 17 Feb 2015 22:49:50 +0100
Subject: [PATCH] explicitely link with libX11
---
src/Main/CMakeLists.txt | 1 +
utils/fgviewer/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 12c0961..78c4163 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -142,6 +142,7 @@ target_link_libraries(fgfs
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
${PLATFORM_LIBS}
+ ${X11_X11_LIB}
)
if(ENABLE_FLITE)
--- protocol/discovery/mdns.c.orig 2015-11-17 09:58:44.171711728 +0100
+++ protocol/discovery/mdns.c 2015-11-17 09:59:11.347535726 +0100
@@ -28,6 +28,7 @@
#include <string.h>
#include <syslog.h>
#include <sys/socket.h>
+#include <sys/select.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
--- a/build/build.xml
+++ b/build/build.xml
@@ -290,6 +290,7 @@
<delete dir="${build.classes}" quiet="true"/>
<mkdir dir="${build.classes}"/>
<javac encoding="iso-8859-1" debug="true" target="1.7"
+ source="1.7"
srcdir="${src.dir}"
sourcepath=""
destdir="${build.classes}"
@@ -307,6 +308,7 @@
<target name="compile.test.copyright.classes">
<mkdir dir="${build.classes}"/>
<javac encoding="iso-8859-1" debug="true" target="1.7"
+ source="1.7"
srcdir="${test.dir}"
destdir="${build.classes}"
classpath="${jdk14.classpath}">
@@ -320,6 +322,7 @@
<mkdir dir="${build.junit.classes}"/>
<javac encoding="iso-8859-1" debug="true" target="1.7"
+ source="1.7"
srcdir="${src.dir}"
destdir="${build.junit.classes}"
classpath="${jdk14.classpath}:${build.classes}:${bytecodelib}:${junitlib}">
--- build/cmd/hyperkube/main.go.orig
+++ build/cmd/hyperkube/main.go
@@ -36,7 +36,6 @@
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
- kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
@@ -87,12 +86,6 @@
func NewHyperKubeCommand(stopCh <-chan struct{}) (*cobra.Command, []func() *cobra.Command) {
// these have to be functions since the command is polymorphic. Cobra wants you to be top level
// command to get executed
- apiserver := func() *cobra.Command {
- ret := kubeapiserver.NewAPIServerCommand(stopCh)
- // add back some unfortunate aliases that should be removed
- ret.Aliases = []string{"apiserver"}
- return ret
- }
controller := func() *cobra.Command {
ret := kubecontrollermanager.NewControllerManagerCommand()
// add back some unfortunate aliases that should be removed
@@ -116,7 +109,6 @@
cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() }
commandFns := []func() *cobra.Command{
- apiserver,
controller,
proxy,
scheduler,
From 7d365628d84b1698a68d968b00544f8b6630e3ce Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 4 Mar 2017 16:36:30 +0100
Subject: [PATCH] Avoid use of glibc-internal macros.
---
ChangeLog | 10 ++++++++++
src/fault-linux-arm.h | 4 ++--
src/fault-linux-powerpc.h | 8 ++++----
src/fault-linux-sparc-old.h | 6 +++---
src/fault-linux-sparc.h | 4 ++--
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/fault-linux-arm.h b/src/fault-linux-arm.h
index a3da5f8..efd9d5b 100644
--- a/src/fault-linux-arm.h
+++ b/src/fault-linux-arm.h
@@ -17,7 +17,7 @@
#include "fault-posix-ucontext.h"
-#if __WORDSIZE == 64
+#if defined(__aarch64__) || defined(__ARM_64BIT_STATE) || defined(__ARM_PCS_AAPCS64) /* 64-bit */
/* See glibc/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h.
Note that the 'mcontext_t' defined in
@@ -27,7 +27,7 @@
#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.sp
-#else
+#else /* 32-bit */
/* See glibc/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
and the definition of GET_STACK in
diff --git a/src/fault-linux-powerpc.h b/src/fault-linux-powerpc.h
index 97fd0ab..36a3468 100644
--- a/src/fault-linux-powerpc.h
+++ b/src/fault-linux-powerpc.h
@@ -1,5 +1,5 @@
/* Fault handler information. Linux/PowerPC version when it supports POSIX.
- Copyright (C) 2002, 2009 Bruno Haible <bruno@clisp.org>
+ Copyright (C) 2002, 2009, 2017 Bruno Haible <bruno@clisp.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
and the 'struct pt_regs' defined in <asm/ptrace.h>
are quite different types. */
-#if __WORDSIZE == 32
+#if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
+#else /* 32-bit */
/* both should be equivalent */
# if 0
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
# else
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
# endif
-#else
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
#endif
diff --git a/src/fault-linux-sparc-old.h b/src/fault-linux-sparc-old.h
index 2acaeb3..3212fbd 100644
--- a/src/fault-linux-sparc-old.h
+++ b/src/fault-linux-sparc-old.h
@@ -1,5 +1,5 @@
/* Fault handler information. Linux/SPARC version.
- Copyright (C) 2002, 2009 Bruno Haible <bruno@clisp.org>
+ Copyright (C) 2002, 2009, 2017 Bruno Haible <bruno@clisp.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,9 +23,9 @@
#if 1 /* Old? FIXME */
# define SIGSEGV_FAULT_STACKPOINTER scp->sigc_sp
#else
-# if __WORDSIZE == 64
+# if defined(__sparcv9) || defined(__arch64__) /* 64-bit */
# define SIGSEGV_FAULT_STACKPOINTER scp->sigc_regs.u_regs[14]
-# else
+# else /* 32-bit */
# define SIGSEGV_FAULT_STACKPOINTER scp->si_regs.u_regs[14]
# endif
#endif
diff --git a/src/fault-linux-sparc.h b/src/fault-linux-sparc.h
index 8b37874..9c1c285 100644
--- a/src/fault-linux-sparc.h
+++ b/src/fault-linux-sparc.h
@@ -27,13 +27,13 @@
(see also <asm/sigcontext.h>)
are quite different types. */
-#if __WORDSIZE == 64
+#if defined(__sparcv9) || defined(__arch64__) /* 64-bit */
/* From linux-4.8.1/arch/sparc/kernel/signal_64.c, function setup_rt_frame, we
see that ucp is not an 'ucontext_t *' but rather a 'struct sigcontext *'
that happens to have the same value as sip (which is possible because a
'struct sigcontext' starts with 128 bytes room for the siginfo_t). */
#define SIGSEGV_FAULT_STACKPOINTER (((struct sigcontext *) ucp)->sigc_regs.u_regs[14] + 2047)
-#else
+#else /* 32-bit */
/* From linux-4.8.1/arch/sparc/kernel/signal_32.c, function setup_rt_frame,
and linux-4.8.1/arch/sparc/kernel/signal32.c, function setup_rt_frame32, we
see that ucp is a 'struct pt_regs *' or 'struct pt_regs32 *', respectively.
--
2.14.2
From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001
From: David Huffman <storedbox+alpine@outlook.com>
Date: Wed, 6 Jan 2016 07:09:30 -0500
Subject: [PATCH] hard-code glibc's definition of struct mallinfo
---
src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h
index 781cadc..e1ea1ae 100644
--- a/src/tbbmalloc/proxy.h
+++ b/src/tbbmalloc/proxy.h
@@ -32,6 +32,26 @@
#include <stddef.h>
+// The following definition was taken from /usr/include/malloc.h as provided by
+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is
+// made available under the GNU Lesser General Public License v2.1 or later.
+// See <https://www.gnu.org/licenses>.
+//
+// Copyright (C) 1996-2014 Free Software Foundation, Inc.
+struct mallinfo
+{
+ int arena; /* non-mmapped space allocated from system */
+ int ordblks; /* number of free chunks */
+ int smblks; /* number of fastbin blocks */
+ int hblks; /* number of mmapped regions */
+ int hblkhd; /* space in mmapped regions */
+ int usmblks; /* maximum total allocated space */
+ int fsmblks; /* space available in freed fastbin blocks */
+ int uordblks; /* total allocated space */
+ int fordblks; /* total free space */
+ int keepcost; /* top-most, releasable (via malloc_trim) space */
+};
+
extern "C" {
void * scalable_malloc(size_t size);
void * scalable_calloc(size_t nobj, size_t size);
--
2.6.2
workaround. fixed upstream:
https://github.com/arvidn/libtorrent/commit/680eddf3d421f97ba01e8c162b263f31693ba352
--- ./configure.orig
+++ ./configure
@@ -20267,7 +20267,6 @@
COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 "
-COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -msse4.2 "
$as_echo "#define BOOST_EXCEPTION_DISABLE 1" >>confdefs.h
From 40bfd476f6bb44f9bf88bbbc0bd4cfd9591bedc9 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 28 Feb 2018 16:07:18 +0100
Subject: [PATCH] drm/meson: Call drm_crtc_vblank_on / drm_crtc_vblank_off
Make sure that the CRTC code will call the enable/disable_vblank hooks.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/gpu/drm/meson/meson_crtc.c | 4 ++++
drivers/gpu/drm/meson/meson_venc.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
index 0552020..7c0bdc8 100644
--- a/drivers/gpu/drm/meson/meson_crtc.c
+++ b/drivers/gpu/drm/meson/meson_crtc.c
@@ -102,6 +102,8 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
priv->io_base + _REG(VPP_MISC));
priv->viu.osd1_enabled = true;
+
+ drm_crtc_vblank_on(crtc);
}
static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -110,6 +112,8 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
struct meson_drm *priv = meson_crtc->priv;
+ drm_crtc_vblank_off(crtc);
+
priv->viu.osd1_enabled = false;
priv->viu.osd1_commit = false;
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 514245e..14aac66 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -71,6 +71,7 @@
*/
/* HHI Registers */
+#define HHI_GCLK_MPEG2 0x148 /* 0x52 offset in data sheet */
#define HHI_VDAC_CNTL0 0x2F4 /* 0xbd offset in data sheet */
#define HHI_VDAC_CNTL1 0x2F8 /* 0xbe offset in data sheet */
#define HHI_HDMI_PHY_CNTL0 0x3a0 /* 0xe8 offset in data sheet */
@@ -1529,10 +1530,12 @@ unsigned int meson_venci_get_field(struct meson_drm *priv)
void meson_venc_enable_vsync(struct meson_drm *priv)
{
writel_relaxed(2, priv->io_base + _REG(VENC_INTCTRL));
+ regmap_update_bits(priv->hhi, HHI_GCLK_MPEG2, BIT(25), BIT(25));
}
void meson_venc_disable_vsync(struct meson_drm *priv)
{
+ regmap_update_bits(priv->hhi, HHI_GCLK_MPEG2, BIT(25), 0);
writel_relaxed(0, priv->io_base + _REG(VENC_INTCTRL));
}
From 5a258bd31dab2dad8afcced8a7a85fa92e04edab Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 28 Feb 2018 16:07:18 +0100
Subject: [PATCH] drm/meson: Fixes for drm_crtc_vblank_on/off support
Since Linux 4.17, calls to drm_crtc_vblank_on/off are mandatory, and we get
a warning when ctrc is disabled :
driver forgot to call drm_crtc_vblank_off()
But, the vsync IRQ was not totally disabled due the transient hardware
state, thus adding proper IRQ masking from the HHI system control registers.
The last change fixes a race condition introduced by calling the added
drm_crtc_vblank_on/off when an HPD event occurs from the HDMI connector,
triggering a WARN_ON() in the _atomic_bebin() callback when the CRTC
is disabled, thus also triggering a WARN_ON() in drm_vblank_put() :
WARNING: CPU: 0 PID: 1185 at drivers/gpu/drm/meson/meson_crtc.c:157 meson_crtc_atomic_begin+0x78/0x80
[...]
Call trace:
meson_crtc_atomic_begin+0x78/0x80
drm_atomic_helper_commit_planes+0x140/0x218
drm_atomic_helper_commit_tail+0x38/0x80
commit_tail+0x7c/0x80
drm_atomic_helper_commit+0xdc/0x150
drm_atomic_commit+0x54/0x60
restore_fbdev_mode_atomic+0x198/0x238
restore_fbdev_mode+0x6c/0x1c0
drm_fb_helper_restore_fbdev_mode_unlocked+0x7c/0xf0
drm_fb_helper_set_par+0x34/0x60
drm_fb_helper_hotplug_event.part.28+0xb8/0xc8
drm_fbdev_client_hotplug+0xa4/0xe0
drm_client_dev_hotplug+0x90/0xe0
drm_kms_helper_hotplug_event+0x3c/0x48
drm_helper_hpd_irq_event+0x134/0x168
dw_hdmi_top_thread_irq+0x3c/0x50
[...]
WARNING: CPU: 0 PID: 1185 at drivers/gpu/drm/drm_vblank.c:1026 drm_vblank_put+0xb4/0xc8
[...]
Call trace:
drm_vblank_put+0xb4/0xc8
drm_crtc_vblank_put+0x24/0x30
drm_atomic_helper_wait_for_vblanks.part.9+0x130/0x2b8
drm_atomic_helper_commit_tail+0x68/0x80
[...]
The issue is the vblank need to be enabled in any occurence of :
- atomic_enable()
- atomic_begin() and state->enable == true, which was not the case
Moving the CRTC enable code to a common function and calling in one
of these occurence solves this race condition and makes sure vblank
is enabled in each call to _atomic_begin() from the HPD event leading
to drm_atomic_helper_commit_planes().
To Summarize :
- Make sure that the CRTC code will calls the drm_crtc_vblank_on/off
- *Really* mask the Vsync IRQ
- Initialize and enable vblank at the first _atomic_begin()/_atomic_enable()
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/gpu/drm/meson/meson_crtc.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
index 6099997..f8e260b 100644
--- a/drivers/gpu/drm/meson/meson_crtc.c
+++ b/drivers/gpu/drm/meson/meson_crtc.c
@@ -46,6 +46,7 @@ struct meson_crtc {
struct drm_crtc base;
struct drm_pending_vblank_event *event;
struct meson_drm *priv;
+ bool enabled;
};
#define to_meson_crtc(x) container_of(x, struct meson_crtc, base)
@@ -81,8 +82,7 @@ static const struct drm_crtc_funcs meson_crtc_funcs = {
};
-static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state)
+static void meson_crtc_enable(struct drm_crtc *crtc)
{
struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
struct drm_crtc_state *crtc_state = crtc->state;
@@ -106,6 +106,22 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
writel_bits_relaxed(VPP_POSTBLEND_ENABLE, VPP_POSTBLEND_ENABLE,
priv->io_base + _REG(VPP_MISC));
+ drm_crtc_vblank_on(crtc);
+
+ meson_crtc->enabled = true;
+}
+
+static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
+ struct drm_crtc_state *old_state)
+{
+ struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
+ struct meson_drm *priv = meson_crtc->priv;
+
+ DRM_DEBUG_DRIVER("\n");
+
+ if (!meson_crtc->enabled)
+ meson_crtc_enable(crtc);
+
priv->viu.osd1_enabled = true;
drm_crtc_vblank_on(crtc);
@@ -139,6 +155,8 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
crtc->state->event = NULL;
}
+
+ meson_crtc->enabled = false;
}
static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -147,6 +165,9 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
unsigned long flags;
+ if (crtc->state->enable && !meson_crtc->enabled)
+ meson_crtc_enable(crtc);
+
if (crtc->state->event) {
WARN_ON(drm_crtc_vblank_get(crtc) != 0);
This fixes the following build error:
[869/876] Linking CXX shared library lib/liblldb.so.5.0.0
FAILED: lib/liblldb.so.5.0.0
...
/usr/bin/../lib/gcc/x86_64-alpine-linux-musl/6.4.0/../../../libclangSema.a(SemaExprObjC.cpp.o): In function `applyCocoaAPICheck(clang::Sema&, clang::ObjCMessageExpr const*, unsigned int, bool (*)(clang::ObjCMessageExpr const*, clang::NSAPI const&, clang::edit::Commit&)) [clone .constprop.696]':
SemaExprObjC.cpp:(.text._ZL18applyCocoaAPICheckRN5clang4SemaEPKNS_15ObjCMessageExprEjPFbS4_RKNS_5NSAPIERNS_4edit6CommitEE.constprop.696+0x13c): undefined reference to `clang::edit::rewriteObjCRedundantCallWithLiteral(clang::ObjCMessageExpr const*, clang::NSAPI const&, clang::edit::Commit&)'
/usr/bin/../lib/gcc/x86_64-alpine-linux-musl/6.4.0/../../../libclangSema.a(SemaExprObjC.cpp.o): In function `(anonymous namespace)::ARCCastChecker::VisitCallExpr(clang::CallExpr*)':
SemaExprObjC.cpp:(.text._ZN12_GLOBAL__N_114ARCCastChecker13VisitCallExprEPN5clang8CallExprE+0x12e): undefined reference to `clang::ento::coreFoundation::followsCreateRule(clang::FunctionDecl const*)'
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
See https://github.com/alpinelinux/aports/pull/2342 for more information.
--- a/cmake/modules/LLDBStandalone.cmake.orig
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -101,6 +101,7 @@
# Import CMake library targets from LLVM and Clang.
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
+ include("/usr/lib/cmake/clang/ClangConfig.cmake")
if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
endif()
From 9193db67743d08f418235fee43747bb9d42d62ce Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 15 Mar 2019 11:19:27 -0400
Subject: [PATCH] fix: tests: link libpause_consumer on liblttng-ctl
This preload test library uses symbols from liblttng-ctl which are
resolved when preloaded by GLIBC but not by MUSL.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
tests/regression/tools/notification/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
index 33e95886d..b869bdb1d 100644
--- a/tests/regression/tools/notification/Makefile.am
+++ b/tests/regression/tools/notification/Makefile.am
@@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
-rpath $(abs_builddir)
libpause_consumer_la_SOURCES = consumer_testpoints.c
-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
+libpause_consumer_la_LIBADD = \
+ $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+ $(DL_LIBS)
libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
noinst_LTLIBRARIES = libpause_consumer.la
diff --git a/Makefile b/Makefile
index 92522fb..fb2d3f5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@
NAME = pure-maps
VERSION = 1.21.1
RELEASE = $(NAME)-$(VERSION)
-DESTDIR =
PREFIX = /usr
EXEDIR = $(DESTDIR)$(PREFIX)/bin
EXE = $(EXEDIR)/$(NAME)
DATADIR = $(DESTDIR)$(PREFIX)/share/$(NAME)
+LANGDIR = $(DESTDIR)$(PREFIX)/share/locale
DESKTOPDIR = $(DESTDIR)$(PREFIX)/share/applications
ICONDIR = $(DESTDIR)$(PREFIX)/share/icons/hicolor
METADIR = $(DESTDIR)$(PREFIX)/share/metainfo
@@ -19,8 +19,8 @@ LCONVERT = $(or $(wildcard /usr/lib/qt5/bin/lconvert),\
define install-translation =
# GNU gettext translations for Python use.
- mkdir -p $(DATADIR)/locale/$(1)/LC_MESSAGES
- msgfmt po/$(1).po -o $(DATADIR)/locale/$(1)/LC_MESSAGES/pure-maps.mo
+ mkdir -p $(LANGDIR)/$(1)/LC_MESSAGES
+ msgfmt po/$(1).po -o $(LANGDIR)/$(1)/LC_MESSAGES/pure-maps.mo
# Qt linguist translations for QML use.
mkdir -p $(DATADIR)/translations
$(LCONVERT) -o $(DATADIR)/translations/$(NAME)-$(1).qm po/$(1).po
diff -ruN a/config/nim.cfg b/config/nim.cfg
--- a/config/nim.cfg 2018-01-06 22:48:43.920598426 +0100
+++ b/config/nim.cfg 2018-01-06 22:49:43.620979479 +0100
@@ -9,6 +9,7 @@
# gcc.path %= "$CC_PATH"
cc = gcc
+define:nimCoroutinesSetjmp
# additional options always passed to the compiler:
--parallel_build: "0" # 0 to auto-detect number of processors
From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
From: pkviet <pkv.stream@gmail.com>
Date: Thu, 29 Nov 2018 21:10:45 +0100
Subject: [PATCH] obs-libfdk: Compatibility fix for new API
fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
the encoderDelay parameter is replaced by two, nDelay and