[PATCH] Fix darwin compilation and silence compiler warning.
Hi, darwin compilation fails for all FATE-machines compilers. Unfortunately, on my darwin it works fine with the same compiler version as one of the machines... Justin Derrick reported a compiler error that should be fixed with the first patch. Possibly fixes FATE, too. Otherwise I will need more than the linker error not able to find lavd/qtkit.o what can be seen on FATE. The second patch silences a warning, while I am at it... -Thilo
$Subject. Untested because it works for me without this. Feedback welcome or I will have to wait for FATE. -Thilo
On Mon, Mar 31, 2014 at 02:27:07PM +0200, Thilo Borgmann wrote:
$Subject. Untested because it works for me without this. Feedback welcome or I will have to wait for FATE.
-Thilo
qtkit.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) a4b41f7cfa43e347e2493335565c470ab4b81fb2 0001-lavd-qtkit-Fix-non-constant-initializer-element-for-.patch From 4c49ff4660ca7d59af5d312f4d1802b885785377 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann <thilo.borgmann@mail.de> Date: Mon, 31 Mar 2014 14:16:26 +0200 Subject: [PATCH 1/2] lavd/qtkit: Fix non-constant initializer element for some clang compilers.
applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If a bugfix only changes things apparently unrelated to the bug with no further explanation, that is a good sign that the bugfix is wrong.
$Subject. -Thilo
Am 31.03.14 14:27, schrieb Thilo Borgmann:
[PATCH 2/2] lavd/qtkit: Use a const char* while enumerating devices.
Ping. -Thilo
On Wed, Apr 02, 2014 at 11:20:26AM +0200, Thilo Borgmann wrote:
Am 31.03.14 14:27, schrieb Thilo Borgmann:
[PATCH 2/2] lavd/qtkit: Use a const char* while enumerating devices.
Ping.
Applying: lavd/qtkit: Use a const char* while enumerating devices. fatal: sha1 information is lacking or useless (libavdevice/qtkit.m). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 lavd/qtkit: Use a const char* while enumerating devices. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have often repented speaking, but never of holding my tongue. -- Xenocrates
On 4/2/2014 7:00 PM, Michael Niedermayer wrote:
Applying: lavd/qtkit: Use a const char* while enumerating devices. fatal: sha1 information is lacking or useless (libavdevice/qtkit.m). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 lavd/qtkit: Use a const char* while enumerating devices.
patch -p1 < 0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch git commit -a --author="Thilo Borgmann <thilo.borgmann@mail.de>" - Derek
On Wed, Apr 02, 2014 at 07:57:57PM +0100, Derek Buitenhuis wrote:
On 4/2/2014 7:00 PM, Michael Niedermayer wrote:
Applying: lavd/qtkit: Use a const char* while enumerating devices. fatal: sha1 information is lacking or useless (libavdevice/qtkit.m). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 lavd/qtkit: Use a const char* while enumerating devices.
patch -p1 < 0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch git commit -a --author="Thilo Borgmann <thilo.borgmann@mail.de>"
patch -p1 <~/0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch patching file libavdevice/qtkit.m Hunk #1 FAILED at 153. 1 out of 1 hunk FAILED -- saving rejects to file libavdevice/qtkit.m.rej [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin
Am 02.04.14 21:21, schrieb Michael Niedermayer:
On Wed, Apr 02, 2014 at 07:57:57PM +0100, Derek Buitenhuis wrote:
On 4/2/2014 7:00 PM, Michael Niedermayer wrote:
Applying: lavd/qtkit: Use a const char* while enumerating devices. fatal: sha1 information is lacking or useless (libavdevice/qtkit.m). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 lavd/qtkit: Use a const char* while enumerating devices.
patch -p1 < 0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch git commit -a --author="Thilo Borgmann <thilo.borgmann@mail.de>"
patch -p1 <~/0002-lavd-qtkit-Use-a-const-char-while-enumerating-device.patch patching file libavdevice/qtkit.m Hunk #1 FAILED at 153. 1 out of 1 hunk FAILED -- saving rejects to file libavdevice/qtkit.m.rej
Sorry was a follow-up of a not yet applied patch. My fault. Forget about this, the original patch is updated, see: lavd/qtkit: Support choosing the input device by index or by name. Thanks, Thilo
participants (3)
-
Derek Buitenhuis -
Michael Niedermayer -
Thilo Borgmann