From 14de06e2924c4f1d86c8d19670fd4f9d7d0c271a Mon Sep 17 00:00:00 2001
From: Marvin Scholz <epirat07@gmail.com>
Date: Fri, 10 Jan 2020 17:19:25 +0100
Subject: [PATCH] videotoolbox: switch to C instead of Objective-C
---
extras/package/macosx/VLC.xcodeproj/project.pbxproj | 4 ++--
modules/codec/Makefile.am | 10 +++++-----
modules/codec/{videotoolbox.m => videotoolbox.c} | 2 +-
po/POTFILES.in | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename modules/codec/{videotoolbox.m => videotoolbox.c} (99%)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 76c85cb66d64..e9fdfcee6912 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -437,7 +437,7 @@
6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audiotoolbox_midi.c; path = ../../../modules/codec/audiotoolbox_midi.c; sourceTree = "<group>"; };
6BF5C5021EFE66EF008A9C12 /* VLCHUDTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDTableView.h; sourceTree = "<group>"; };
6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDTableView.m; sourceTree = "<group>"; };
- 7D0A387820CBCC4D00D4BF3B /* videotoolbox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = videotoolbox.m; path = ../../../modules/codec/videotoolbox.m; sourceTree = "<group>"; };
+ 7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = videotoolbox.c; path = ../../../modules/codec/videotoolbox.c; sourceTree = "<group>"; };
7D0F5A992264EB410009C48A /* VLCHotkeysController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCHotkeysController.h; sourceTree = "<group>"; };
7D0F5A9A2264EB410009C48A /* VLCHotkeysController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCHotkeysController.m; sourceTree = "<group>"; };
7D0F63FD2201F63400FDB91F /* VLCPlaylistTableCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistTableCellView.h; sourceTree = "<group>"; };
@@ -1347,7 +1347,7 @@
6BF56C3C1FCF0088004A411A /* codec */ = {
isa = PBXGroup;
children = (
- 7D0A387820CBCC4D00D4BF3B /* videotoolbox.m */,
+ 7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */,
6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */,
);
name = codec;
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 06d6095ac45c..fad41d08854b 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -339,21 +339,21 @@ codec_LTLIBRARIES += $(LTLIBoggspots)
libvideotoolbox_plugin_la_SOURCES = \
codec/vt_utils.c codec/vt_utils.h \
- codec/videotoolbox.m codec/hxxx_helper.c codec/hxxx_helper.h \
+ codec/videotoolbox.c codec/hxxx_helper.c codec/hxxx_helper.h \
packetizer/hxxx_nal.h packetizer/hxxx_nal.c \
packetizer/hxxx_sei.h packetizer/hxxx_sei.c \
packetizer/h264_slice.c packetizer/h264_slice.h \
packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/hevc_nal.c packetizer/hevc_nal.h
-libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
+libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS)
if HAVE_IOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=9.0
+libvideotoolbox_plugin_la_CFLAGS += -miphoneos-version-min=9.0
endif
if HAVE_TVOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -mtvos-version-min=10.2
+libvideotoolbox_plugin_la_CFLAGS += -mtvos-version-min=10.2
endif
libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la
-libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
+libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la
codec_LTLIBRARIES += $(LTLIBvideotoolbox)
diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.c
similarity index 99%
rename from modules/codec/videotoolbox.m
rename to modules/codec/videotoolbox.c
index 5faa29429e58..873f28e69212 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * videotoolbox.m: Video Toolbox decoder
+ * videotoolbox.c: Video Toolbox decoder
*****************************************************************************
* Copyright © 2014-2015 VideoLabs SAS
*
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eca756ff762c..0cc772061a5f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -346,7 +346,7 @@ modules/codec/ttml/ttml.c
modules/codec/ttml/ttml.h
modules/codec/twolame.c
modules/codec/uleaddvaudio.c
-modules/codec/videotoolbox.m
+modules/codec/videotoolbox.c
modules/codec/vorbis.c
modules/codec/vpx.c
modules/codec/webvtt/webvtt.c
--
GitLab