mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8486 from huwpascoe/rxml

Browse Source 
Re-enable RXML and purge libxml
This commit is contained in:
Twinaphex 2019-03-23 03:25:32 +01:00 committed by GitHub
commit 123cd67a6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 7 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -62,7 +62,6 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
/freetype2/
/ft2build.h
/iconv.h
/libxml2/
/phoenix/
/python/
/rsound.h

8
Makefile.common
View File

@ -1474,13 +1474,6 @@ ifeq ($(WANT_WGL), 1)
LIBS += -lcomctl32
endif
#ifeq ($(HAVE_LIBXML2), 1)
#LIBS += $(LIBXML2_LIBS)
#DEFINES += $(LIBXML2_CFLAGS)
#else
#OBJ += $(LIBRETRO_COMM_DIR)/formats/xml/rxml.o
#endif
# Compression/Archive
OBJ += $(LIBRETRO_COMM_DIR)/file/archive_file.o \
@ -1617,6 +1610,7 @@ endif
OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \
$(LIBRETRO_COMM_DIR)/formats/json/jsonsax.o \
$(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \
$(LIBRETRO_COMM_DIR)/formats/xml/rxml.o \
$(LIBRETRO_COMM_DIR)/formats/image_transfer.o
ifdef HAVE_COMPRESSION

6
Makefile.win
View File

@ -32,7 +32,6 @@ HAVE_FREETYPE := 1
HAVE_FFMPEG := 0
HAVE_CG := 1
HAVE_LIBXML2 := 0
HAVE_ZLIB := 1
WANT_ZLIB := 1
HAVE_CC_RESAMPLER := 1
@ -46,11 +45,6 @@ FREETYPE_CFLAGS := -DHAVE_FREETYPE -Ifreetype2
FREETYPE_LIBS := -lfreetype
endif
ifeq ($(HAVE_LIBXML2), 1)
LIBXML2_CFLAGS := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL
LIBXML2_LIBS := -lxml2 -liconv
endif
ifeq ($(HAVE_SDL), 1)
SDL_LIBS := -lSDL
SDL_CFLAGS := -ISDL -DHAVE_SDL

2
README-mali_fbdev_r4p0.md
View File

@ -80,7 +80,7 @@ To enable mali_fbdev you must configure RetroArch with --enable-gles and --enabl
This is an example of what you would use on a CubieBoard2 for a lightweight RetroArch:
./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip --disable-libxml2
./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip
NOTE: A TTY hack is used to auto-clean the console on exit, and the fbdev ioctls are used to retrieve
current video mode. Both things work good, but they are not exactly ideal solutions.

1
README.md
View File

@ -105,7 +105,6 @@ OSX port of RetroArch requires latest versions of XCode to build.
RetroArch can utilize these libraries if enabled:
- nvidia-cg-toolkit
- libxml2 (GLSL XML shaders)
- libfreetype2 (TTF font rendering on screen)
RetroArch needs at least one of these audio driver libraries:

6
config.features.h
View File

@ -260,12 +260,6 @@ static const bool _hlsl_supp = true;
static const bool _hlsl_supp = false;
#endif
#ifdef HAVE_LIBXML2
static const bool _libxml2_supp = true;
#else
static const bool _libxml2_supp = false;
#endif
#ifdef HAVE_SDL_IMAGE
static const bool _sdl_image_supp = true;
#else

5
griffin/griffin.c
View File

@ -1439,12 +1439,7 @@ DEPENDENCIES
/*============================================================
XML
============================================================ */
#if 0
#ifndef HAVE_LIBXML2
#define RXML_LIBXML2_COMPAT 1
#include "../libretro-common/formats/xml/rxml.c"
#endif
#endif
/*============================================================
AUDIO UTILS

2
intl/msg_hash_ar.h
View File

@ -1553,8 +1553,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML parsing support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (peer-to-peer) support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_chs.h
View File

@ -1579,8 +1579,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML解析支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (点对点) 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_cht.h
View File

@ -1431,8 +1431,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML解析支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (點對點) 支持")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_de.h
View File

@ -1500,8 +1500,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB-Unterstützung")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb-Unterstützung")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Libxml2-XML-Parsing-Unterstützung")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay-Unterstützung (Peer-to-Peer)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

4
intl/msg_hash_el.h
View File

@ -2670,10 +2670,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Υποστήριξη Libusb"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Υποστήριξη ανάλυσης libxml2 XML"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Υποστήριξη Netplay (peer-to-peer)"

2
intl/msg_hash_eo.h
View File

@ -1341,8 +1341,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML parsing support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (peer-to-peer) support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

4
intl/msg_hash_es.h
View File

@ -2738,10 +2738,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Soporte de Libusb"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Soporte de parseo XML libxml2"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Soporte de juego en red (peer-to-peer)"

2
intl/msg_hash_fr.h
View File

@ -1456,8 +1456,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"Support de LibretroDB")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Support de Libusb")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Support du parser XML libxml2")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Support du jeu en réseau (peer-to-peer)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_it.h
View File

@ -1474,8 +1474,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"Supporto LibretroDB ")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Supporto Libusb ")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Supporto libxml2 XML parsing ")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Supporto Netplay (peer-to-peer) ")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_ja.h
View File

@ -1640,8 +1640,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB対応")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb対応")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XMLパース対応")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"ネットプレイ(ピアツーピア)対応")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_ko.h
View File

@ -1428,8 +1428,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB 지원")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb 지원")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML 파싱 지원")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"넷플레이 (P2P) 지원")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_nl.h
View File

@ -1343,8 +1343,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB ondersteuning")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb ondersteuning")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML parsing ondersteuning")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (peer-to-peer) ondersteuning")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_pl.h
View File

@ -1568,8 +1568,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"Obsługa LibretroDB")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Wsparcie Libusb")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Libxml2 obsługa parowania XML")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Wsparcie Gry online (peer-to-peer)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

4
intl/msg_hash_pt_br.h
View File

@ -2742,10 +2742,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Suporte a Libusb"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Suporte a libxml2 XML parsing"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Suporte de jogo em rede (ponto-a-ponto)"

2
intl/msg_hash_pt_pt.h
View File

@ -1420,8 +1420,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"Suporte de LibretroDB")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Suporte de Libusb")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Suporte de análise de libxml2 XML")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Suporte de Netplay (ponto-a-ponto)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

2
intl/msg_hash_ru.h
View File

@ -1455,8 +1455,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"Поддержка LibretroDB")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Поддержка Libusb")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"Поддержка синтаксического анализа libxml2 XML")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Поддержка Netplay (peer-to-peer)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

4
intl/msg_hash_us.h
View File

@ -2786,10 +2786,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb support"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML parsing support"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (peer-to-peer) support"

2
intl/msg_hash_vn.h
View File

@ -1449,8 +1449,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
"LibretroDB support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
"Libusb support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
"libxml2 XML parsing support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
"Netplay (peer-to-peer) support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,

8
libretro-common/formats/xml/rxml.c
View File

@ -116,7 +116,7 @@ static bool range_is_space(const char *begin, const char *end)
return true;
}
static void skip_spaces(const char **ptr_)
static void rxml_skip_spaces(const char **ptr_)
{
const char *ptr = *ptr_;
while (isspace(*ptr))
@ -218,7 +218,7 @@ static char *find_first_space(const char *str)
static bool rxml_parse_tag(struct rxml_node *node, const char *str)
{
const char *str_ptr = str;
skip_spaces(&str_ptr);
rxml_skip_spaces(&str_ptr);
const char *name_end = find_first_space(str_ptr);
if (name_end)
@ -248,7 +248,7 @@ static struct rxml_node *rxml_parse_node(const char **ptr_)
if (!node)
return NULL;
skip_spaces(ptr_);
rxml_skip_spaces(ptr_);
ptr = *ptr_;
if (*ptr != '<')
@ -474,7 +474,7 @@ void rxml_free_document(rxml_document_t *doc)
free(doc);
}
char *rxml_node_attrib(struct rxml_node *node, const char *attrib)
const char *rxml_node_attrib(struct rxml_node *node, const char *attrib)
{
struct rxml_attrib_node *attribs = NULL;
for (attribs = node->attrib; attribs; attribs = attribs->next)

30
libretro-common/include/formats/rxml.h
View File

@ -54,10 +54,6 @@ struct rxml_node
struct rxml_node *children;
struct rxml_node *next;
/* Dummy. Used by libxml2 compat.
* Is always set to 0, so XML_ELEMENT_NODE check goes through. */
int type;
};
rxml_document_t *rxml_load_document(const char *path);
@ -65,30 +61,6 @@ void rxml_free_document(rxml_document_t *doc);
struct rxml_node *rxml_root_node(rxml_document_t *doc);
/* Drop const-correctness here to avoid warnings
* when used as libxml2 compat.
* xmlGetProp() returns xmlChar*, which is supposed
* to be passed to xmlFree(). */
char *rxml_node_attrib(struct rxml_node *node, const char *attrib);
#ifdef RXML_LIBXML2_COMPAT
/* Compat for part of libxml2 that RetroArch uses. */
#define LIBXML_TEST_VERSION ((void)0)
typedef char xmlChar; /* It's really unsigned char, but it doesn't matter. */
typedef struct rxml_node *xmlNodePtr;
typedef void *xmlParserCtxtPtr;
typedef rxml_document_t *xmlDocPtr;
#define XML_ELEMENT_NODE (0)
#define xmlNewParserCtxt() ((void*)-1)
#define xmlCtxtReadFile(ctx, path, a, b) rxml_load_document(path)
#define xmlGetProp(node, prop) rxml_node_attrib(node, prop)
#define xmlFree(p) ((void)0)
#define xmlNodeGetContent(node) (node->data)
#define xmlDocGetRootElement(doc) rxml_root_node(doc)
#define xmlFreeDoc(doc) rxml_free_document(doc)
#define xmlFreeParserCtxt(ctx) ((void)0)
#endif
RETRO_END_DECLS
const char *rxml_node_attrib(struct rxml_node *node, const char *attrib);
#endif

9
menu/menu_displaylist.c
View File

@ -1172,15 +1172,6 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
menu_entries_append_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str),
"%s: %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT),
_libxml2_supp ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_YES) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO));
menu_entries_append_enum(info->list, feat_str, "",
MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(feat_str, sizeof(feat_str),
"%s: %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT),

1
msg_hash.h
View File

@ -1879,7 +1879,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SLANG_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT,
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT,

1
pkg/debian/control
View File

@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9),
libc6-dev (>= 2.13),
libpulse-dev,
libsdl2-dev,
libxml2-dev,
libavcodec-dev,
libavdevice-dev,
libavformat-dev,

1
pkg/sailfishos/retroarch-sailfishos.spec
View File

@ -7,7 +7,6 @@ Group: Applications/Emulators
License: GPLv3+
URL: http://www.libretro.com/
BuildRequires: libxml2-devel
BuildRequires: mesa-llvmpipe-libwayland-egl-devel
BuildRequires: pulseaudio-devel
BuildRequires: OpenAL-devel

2
qb/config.libs.sh
View File

@ -405,8 +405,6 @@ if [ "$HAVE_KMS" != "no" ]; then
fi
fi
check_val '' LIBXML2 -lxml2 libxml2 libxml-2.0 '' '' false
if [ "$HAVE_EGL" = "yes" ]; then
if [ "$HAVE_OPENGLES" != "no" ]; then
if [ "$OPENGLES_LIBS" ] || [ "$OPENGLES_CFLAGS" ]; then

1
qb/config.params.sh
View File

@ -80,7 +80,6 @@ HAVE_EGL=auto # EGL context support
HAVE_VG=auto # OpenVG support
HAVE_CG=auto # Cg shader support
HAVE_HLSL=no # HLSL9 shader support (for Direct3D9)
HAVE_LIBXML2=auto # libxml2 support
HAVE_BUILTINZLIB=no # Bake in zlib
HAVE_ZLIB=auto # zlib support (ZIP extract, PNG decoding/encoding)
HAVE_ALSA=auto # ALSA support

2
retroarch.c
View File

@ -1025,8 +1025,6 @@ static void retroarch_print_features(void)
_PSUPP(glsl, "GLSL", "Fragment/vertex shader driver");
_PSUPP(glsl, "HLSL", "Fragment/vertex shader driver");
_PSUPP(libxml2, "libxml2", "libxml2 XML parsing");
_PSUPP(sdl_image, "SDL_image", "SDL_image image loading");
_PSUPP(rpng, "rpng", "PNG image loading/encoding");
_PSUPP(rpng, "rjpeg", "JPEG image loading");