1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
|
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index 7ce0ad368..fbdfcf195 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -969,7 +969,6 @@
DF93D6A51444A8B1007C6459 /* MusicDatabaseFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67B1444A8B0007C6459 /* MusicDatabaseFile.cpp */; };
DF93D6A61444A8B1007C6459 /* NFSFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67D1444A8B0007C6459 /* NFSFile.cpp */; };
DF93D6A71444A8B1007C6459 /* PipeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67F1444A8B0007C6459 /* PipeFile.cpp */; };
- DF93D6A81444A8B1007C6459 /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6811444A8B0007C6459 /* RarFile.cpp */; };
DF93D6AA1444A8B1007C6459 /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6851444A8B0007C6459 /* SFTPFile.cpp */; };
DF93D6AB1444A8B1007C6459 /* ShoutcastFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */; };
DF93D6AD1444A8B1007C6459 /* SMBFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68B1444A8B0007C6459 /* SMBFile.cpp */; };
@@ -1221,8 +1220,6 @@
E38E204F0D25F9FD00618676 /* PlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17400D25F9FA00618676 /* PlaylistDirectory.cpp */; };
E38E20500D25F9FD00618676 /* PlaylistFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17420D25F9FA00618676 /* PlaylistFileDirectory.cpp */; };
E38E20510D25F9FD00618676 /* PluginDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17440D25F9FA00618676 /* PluginDirectory.cpp */; };
- E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
- E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
E38E205B0D25F9FD00618676 /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
E38E205C0D25F9FD00618676 /* UPnPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E175B0D25F9FA00618676 /* UPnPDirectory.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP -I$SRCROOT/lib/libUPnP/Neptune/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer"; }; };
@@ -1687,9 +1684,6 @@
E49912A0174E5D9900741B6D /* PlaylistFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17420D25F9FA00618676 /* PlaylistFileDirectory.cpp */; };
E49912A1174E5D9900741B6D /* PluginDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17440D25F9FA00618676 /* PluginDirectory.cpp */; };
E49912A2174E5D9900741B6D /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482905156CFF24005A996F /* PVRDirectory.cpp */; };
- E49912A4174E5D9900741B6D /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
- E49912A5174E5D9900741B6D /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6811444A8B0007C6459 /* RarFile.cpp */; };
- E49912A6174E5D9900741B6D /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
E49912A7174E5D9900741B6D /* RSSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */; };
E49912AC174E5D9900741B6D /* SFTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */; };
E49912AD174E5D9900741B6D /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6851444A8B0007C6459 /* SFTPFile.cpp */; };
@@ -3914,8 +3908,6 @@
DF93D67E1444A8B0007C6459 /* NFSFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSFile.h; sourceTree = "<group>"; };
DF93D67F1444A8B0007C6459 /* PipeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipeFile.cpp; sourceTree = "<group>"; };
DF93D6801444A8B0007C6459 /* PipeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipeFile.h; sourceTree = "<group>"; };
- DF93D6811444A8B0007C6459 /* RarFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarFile.cpp; sourceTree = "<group>"; };
- DF93D6821444A8B0007C6459 /* RarFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarFile.h; sourceTree = "<group>"; };
DF93D6851444A8B0007C6459 /* SFTPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFTPFile.cpp; sourceTree = "<group>"; };
DF93D6861444A8B0007C6459 /* SFTPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTPFile.h; sourceTree = "<group>"; };
DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastFile.cpp; sourceTree = "<group>"; };
@@ -4356,10 +4348,6 @@
E38E17430D25F9FA00618676 /* PlaylistFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistFileDirectory.h; sourceTree = "<group>"; };
E38E17440D25F9FA00618676 /* PluginDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginDirectory.cpp; sourceTree = "<group>"; };
E38E17450D25F9FA00618676 /* PluginDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginDirectory.h; sourceTree = "<group>"; };
- E38E17460D25F9FA00618676 /* RarDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarDirectory.cpp; sourceTree = "<group>"; };
- E38E17470D25F9FA00618676 /* RarDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarDirectory.h; sourceTree = "<group>"; };
- E38E17480D25F9FA00618676 /* RarManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarManager.cpp; sourceTree = "<group>"; };
- E38E17490D25F9FA00618676 /* RarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarManager.h; sourceTree = "<group>"; };
E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartPlaylistDirectory.cpp; sourceTree = "<group>"; };
E38E17540D25F9FA00618676 /* SmartPlaylistDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartPlaylistDirectory.h; sourceTree = "<group>"; };
E38E17560D25F9FA00618676 /* SMBDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMBDirectory.h; sourceTree = "<group>"; };
@@ -8445,12 +8433,6 @@
E38E17450D25F9FA00618676 /* PluginDirectory.h */,
C8482905156CFF24005A996F /* PVRDirectory.cpp */,
C8482906156CFF24005A996F /* PVRDirectory.h */,
- E38E17460D25F9FA00618676 /* RarDirectory.cpp */,
- E38E17470D25F9FA00618676 /* RarDirectory.h */,
- DF93D6811444A8B0007C6459 /* RarFile.cpp */,
- DF93D6821444A8B0007C6459 /* RarFile.h */,
- E38E17480D25F9FA00618676 /* RarManager.cpp */,
- E38E17490D25F9FA00618676 /* RarManager.h */,
395C2A0D1A9F072400EBC7AD /* ResourceDirectory.cpp */,
395C2A0E1A9F072400EBC7AD /* ResourceDirectory.h */,
395C2A0F1A9F072400EBC7AD /* ResourceFile.cpp */,
@@ -9920,8 +9902,6 @@
68AE5C1B1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */,
E38E20510D25F9FD00618676 /* PluginDirectory.cpp in Sources */,
7CF3194B1BD2C65500A44A41 /* MusicInfoTagLoaderFFmpeg.cpp in Sources */,
- E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */,
- E38E20530D25F9FD00618676 /* RarManager.cpp in Sources */,
DF54F7FE1B6580AD000FCBA4 /* ContextMenuItem.cpp in Sources */,
395C29C51A98A0E100EBC7AD /* ILanguageInvoker.cpp in Sources */,
E38E20580D25F9FD00618676 /* SmartPlaylistDirectory.cpp in Sources */,
@@ -10497,7 +10477,6 @@
DF93D6A61444A8B1007C6459 /* NFSFile.cpp in Sources */,
DF93D6A71444A8B1007C6459 /* PipeFile.cpp in Sources */,
EDED2E8B1C878E62000F5E80 /* AddonCallbacksGUI.cpp in Sources */,
- DF93D6A81444A8B1007C6459 /* RarFile.cpp in Sources */,
DF93D6AA1444A8B1007C6459 /* SFTPFile.cpp in Sources */,
DF93D6AB1444A8B1007C6459 /* ShoutcastFile.cpp in Sources */,
DF93D6AD1444A8B1007C6459 /* SMBFile.cpp in Sources */,
@@ -11235,9 +11214,6 @@
E49912A1174E5D9900741B6D /* PluginDirectory.cpp in Sources */,
E49912A2174E5D9900741B6D /* PVRDirectory.cpp in Sources */,
395C29DC1A98A11C00EBC7AD /* WsgiResponse.cpp in Sources */,
- E49912A4174E5D9900741B6D /* RarDirectory.cpp in Sources */,
- E49912A5174E5D9900741B6D /* RarFile.cpp in Sources */,
- E49912A6174E5D9900741B6D /* RarManager.cpp in Sources */,
E49912A7174E5D9900741B6D /* RSSDirectory.cpp in Sources */,
7C8E02231BA35D0B0072E8B2 /* Builtins.cpp in Sources */,
E49912AC174E5D9900741B6D /* SFTPDirectory.cpp in Sources */,
diff --git a/Makefile.in b/Makefile.in
index 0d70e9b12..a434052e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,10 +193,6 @@ ifeq ($(findstring freebsd,@ARCH@),freebsd)
DIRECTORY_ARCHIVES += xbmc/freebsd/freebsd.a
endif
-ifeq (@HAVE_XBMC_NONFREE@,1)
-DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a
-endif
-
ifeq (@USE_ANDROID@,1)
DIRECTORY_ARCHIVES += xbmc/platform/android/loader/AndroidDyload.a
DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
diff --git a/addons/repository.xbmc.org/addon.xml b/addons/repository.xbmc.org/addon.xml
index 54e1a20b1..511606b00 100644
--- a/addons/repository.xbmc.org/addon.xml
+++ b/addons/repository.xbmc.org/addon.xml
@@ -7,9 +7,9 @@
<import addon="xbmc.addon" version="12.0.0"/>
</requires>
<extension point="xbmc.addon.repository">
- <info>http://mirrors.kodi.tv/addons/krypton/addons.xml.gz</info>
- <checksum>http://mirrors.kodi.tv/addons/krypton/addons.xml.gz.md5</checksum>
- <datadir>http://mirrors.kodi.tv/addons/krypton</datadir>
+ <info>http://repo.parabola.nu/other/kodi-libre/addons/krypton/addons.xml.gz</info>
+ <checksum>http://repo.parabola.nu/other/kodi-libre/addons/krypton/addons.xml.gz.md5</checksum>
+ <datadir>http://repo.parabola.nu/other/kodi-libre/addons/krypton</datadir>
<hashes>true</hashes>
</extension>
<extension point="xbmc.addon.metadata">
diff --git a/configure.ac b/configure.ac
index 060939073..63cea4cc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,12 +370,6 @@ AC_ARG_ENABLE([avahi],
[use_mdnsembedded=$enableval],
[use_mdnsembedded=auto])
-AC_ARG_ENABLE([non-free],
- [AS_HELP_STRING([--disable-non-free],
- [disable components with non-compliant licenses])],
- [use_nonfree=$enableval],
- [use_nonfree=yes])
-
AC_ARG_ENABLE([mysql],
[AS_HELP_STRING([--disable-mysql],
[disable mysql])],
@@ -2015,15 +2009,6 @@ else
final_message="$final_message\n mDNSEmbedded:\tNo"
fi
-if test "$use_nonfree" = "yes"; then
- final_message="$final_message\n Non-free:\tYes"
- HAVE_XBMC_NONFREE=1
- AC_DEFINE([HAVE_XBMC_NONFREE], [1], [Define to 1 to enable non-free components.])
-else
- HAVE_XBMC_NONFREE=0
- final_message="$final_message\n Non-free:\tNo"
-fi
-
if test "$use_mysql" = "yes"; then
final_message="$final_message\n MySQL:\tYes"
USE_MYSQL=1
@@ -2292,7 +2277,6 @@ AC_SUBST(GNUTLS_ALL_LIBS)
AC_SUBST(USE_LIBAV_HACKS)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
-AC_SUBST(HAVE_XBMC_NONFREE)
AC_SUBST(LIBCURL_BASENAME)
AC_SUBST(LIBASS_BASENAME)
AC_SUBST(LIBMEPG2_BASENAME)
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
index 504e4c046..861d5e9ab 100644
--- a/project/cmake/CMakeLists.txt
+++ b/project/cmake/CMakeLists.txt
@@ -41,7 +41,6 @@ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp")
option(VERBOSE "Enable verbose output?" OFF)
option(ENABLE_DVDCSS "Enable libdvdcss support?" ON)
option(ENABLE_UPNP "Enable UPnP support?" ON)
-option(ENABLE_NONFREE "Enable non-free components?" ON)
option(ENABLE_AIRTUNES "Enable AirTunes support?" ON)
option(ENABLE_OPTICAL "Enable optical support?" ON)
# use ffmpeg from depends or system
@@ -165,10 +164,6 @@ if(ENABLE_UPNP)
list(APPEND DEP_DEFINES "-DUSE_UPNP=1")
endif()
-if(ENABLE_NONFREE)
- list(APPEND DEP_DEFINES "-DHAVE_XBMC_NONFREE=1")
-endif()
-
if(ENABLE_OPTICAL)
list(APPEND DEP_DEFINES -DHAS_DVD_DRIVE)
endif()
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index c6ef0c0e0..4b253fbde 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -78,9 +78,6 @@
#include "GUILargeTextureManager.h"
#include "TextureCache.h"
#include "playlists/SmartPlayList.h"
-#ifdef HAS_FILESYSTEM_RAR
-#include "filesystem/RarManager.h"
-#endif
#include "playlists/PlayList.h"
#include "profiles/ProfilesManager.h"
#include "windowing/WindowingFactory.h"
@@ -2941,9 +2938,6 @@ void CApplication::Stop(int exitCode)
#endif
CLog::Log(LOGNOTICE, "clean cached files!");
-#ifdef HAS_FILESYSTEM_RAR
- g_RarManager.ClearCache(true);
-#endif
#ifdef HAS_FILESYSTEM_SFTP
CSFTPSessionManager::DisconnectAllSessions();
diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp
index 9050b4168..dd47e16c7 100644
--- a/xbmc/SystemGlobals.cpp
+++ b/xbmc/SystemGlobals.cpp
@@ -37,9 +37,6 @@
#include "filesystem/SpecialProtocol.h"
std::map<std::string, std::string> CSpecialProtocol::m_pathMap;
-#if defined(HAS_FILESYSTEM_RAR)
-#include "filesystem/RarManager.h"
-#endif
#include "filesystem/ZipManager.h"
#ifdef TARGET_RASPBERRY_PI
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index c35679411..0ddd47d98 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -54,9 +54,6 @@
#include "filesystem/MultiPathDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "filesystem/RSSDirectory.h"
-#ifdef HAS_FILESYSTEM_RAR
-#include "filesystem/RarManager.h"
-#endif
#ifdef HAS_UPNP
#include "filesystem/UPnPDirectory.h"
#endif
@@ -1933,16 +1930,6 @@ int CUtil::ScanArchiveForAssociatedItems(const std::string& strArchivePath,
return false;
}
else
- {
-#ifdef HAS_FILESYSTEM_RAR
- // get _ALL_files in the rar, even those located in subdirectories because we set the bMask to false.
- // so now we dont have to find any subdirs anymore, all files in the rar is checked.
- if (!g_RarManager.GetFilesInRar(ItemList, strArchivePath, false, ""))
- return false;
-#else
- return false;
-#endif
- }
for (int it = 0; it < ItemList.Size(); ++it)
{
std::string strPathInRar = ItemList[it]->GetPath();
diff --git a/xbmc/filesystem/CMakeLists.txt b/xbmc/filesystem/CMakeLists.txt
index aa9fdf9eb..d4d7ea145 100644
--- a/xbmc/filesystem/CMakeLists.txt
+++ b/xbmc/filesystem/CMakeLists.txt
@@ -44,9 +44,6 @@ set(SOURCES AddonsDirectory.cpp
PlaylistFileDirectory.cpp
PluginDirectory.cpp
PVRDirectory.cpp
- RarDirectory.cpp
- RarFile.cpp
- RarManager.cpp
ResourceDirectory.cpp
ResourceFile.cpp
RSSDirectory.cpp
@@ -123,9 +120,6 @@ set(HEADERS AddonsDirectory.h
PlaylistFileDirectory.h
PluginDirectory.h
RSSDirectory.h
- RarDirectory.h
- RarFile.h
- RarManager.h
ResourceDirectory.h
ResourceFile.h
SFTPDirectory.h
diff --git a/xbmc/filesystem/DirectoryFactory.cpp b/xbmc/filesystem/DirectoryFactory.cpp
index 662b63b5c..3da6513c6 100644
--- a/xbmc/filesystem/DirectoryFactory.cpp
+++ b/xbmc/filesystem/DirectoryFactory.cpp
@@ -76,9 +76,6 @@
#endif
#include "XbtDirectory.h"
#include "ZipDirectory.h"
-#ifdef HAS_FILESYSTEM_RAR
-#include "RarDirectory.h"
-#endif
#include "FileItem.h"
#include "URL.h"
#include "RSSDirectory.h"
@@ -139,14 +136,6 @@ IDirectory* CDirectoryFactory::Create(const CURL& url)
if (url.IsProtocol("apk")) return new CAPKDirectory();
#endif
if (url.IsProtocol("zip")) return new CZipDirectory();
- if (url.IsProtocol("rar"))
- {
-#ifdef HAS_FILESYSTEM_RAR
- return new CRarDirectory();
-#else
- CLog::Log(LOGWARNING, "%s - Compiled without non-free, rar support is disabled", __FUNCTION__);
-#endif
- }
if (url.IsProtocol("xbt")) return new CXbtDirectory();
if (url.IsProtocol("multipath")) return new CMultiPathDirectory();
if (url.IsProtocol("stack")) return new CStackDirectory();
diff --git a/xbmc/filesystem/FileDirectoryFactory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp
index a0fd0a901..af4b7a5df 100644
--- a/xbmc/filesystem/FileDirectoryFactory.cpp
+++ b/xbmc/filesystem/FileDirectoryFactory.cpp
@@ -26,9 +26,6 @@
#include "UDFDirectory.h"
#include "RSSDirectory.h"
#endif
-#ifdef HAS_FILESYSTEM_RAR
-#include "RarDirectory.h"
-#endif
#if defined(TARGET_ANDROID)
#include "APKDirectory.h"
#endif
@@ -178,15 +175,6 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem,
*pItem = *items[0];
}
else
- {
-#ifdef HAS_FILESYSTEM_RAR
- // compressed or more than one file -> create a rar dir
- pItem->SetURL(rarURL);
- return new CRarDirectory;
-#else
- return NULL;
-#endif
- }
return NULL;
}
if (url.IsFileType("xbt"))
diff --git a/xbmc/filesystem/FileFactory.cpp b/xbmc/filesystem/FileFactory.cpp
index c7760bf40..e565726bd 100644
--- a/xbmc/filesystem/FileFactory.cpp
+++ b/xbmc/filesystem/FileFactory.cpp
@@ -50,9 +50,6 @@
#endif
#include "XbtFile.h"
#include "ZipFile.h"
-#ifdef HAS_FILESYSTEM_RAR
-#include "RarFile.h"
-#endif
#ifdef HAS_FILESYSTEM_SFTP
#include "SFTPFile.h"
#endif
@@ -105,14 +102,6 @@ IFile* CFileFactory::CreateLoader(const CURL& url)
if (url.IsProtocol("apk")) return new CAPKFile();
#endif
if (url.IsProtocol("zip")) return new CZipFile();
- else if (url.IsProtocol("rar"))
- {
-#ifdef HAS_FILESYSTEM_RAR
- return new CRarFile();
-#else
- CLog::Log(LOGWARNING, "%s - Compiled without non-free, rar support is disabled", __FUNCTION__);
-#endif
- }
else if (url.IsProtocol("xbt")) return new CXbtFile();
else if (url.IsProtocol("musicdb")) return new CMusicDatabaseFile();
else if (url.IsProtocol("videodb")) return nullptr;
diff --git a/xbmc/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in
index 14fb7b7be..9c412136e 100644
--- a/xbmc/filesystem/Makefile.in
+++ b/xbmc/filesystem/Makefile.in
@@ -78,12 +78,6 @@ SRCS += AndroidAppFile.cpp
SRCS += AndroidAppDirectory.cpp
endif
-ifeq (@HAVE_XBMC_NONFREE@,1)
-SRCS += RarFile.cpp
-SRCS += RarDirectory.cpp
-SRCS += RarManager.cpp
-endif
-
ifeq (@USE_LIBSMBCLIENT@,1)
SRCS += SMBFile.cpp
SRCS += SMBDirectory.cpp
diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
index 5d7763365..6946a6e56 100644
--- a/xbmc/filesystem/test/CMakeLists.txt
+++ b/xbmc/filesystem/test/CMakeLists.txt
@@ -1,7 +1,6 @@
set(SOURCES TestDirectory.cpp
TestFile.cpp
TestFileFactory.cpp
- TestRarFile.cpp
TestZipFile.cpp)
core_add_test_library(filesystem_test)
diff --git a/xbmc/filesystem/test/Makefile b/xbmc/filesystem/test/Makefile
index 6589d7164..d528be284 100644
--- a/xbmc/filesystem/test/Makefile
+++ b/xbmc/filesystem/test/Makefile
@@ -3,7 +3,6 @@ SRCS= \
TestFile.cpp \
TestFileFactory.cpp \
TestNfsFile.cpp \
- TestRarFile.cpp \
TestZipFile.cpp
LIB=filesystemTest.a
diff --git a/xbmc/interfaces/builtins/ApplicationBuiltins.cpp b/xbmc/interfaces/builtins/ApplicationBuiltins.cpp
index 86be03fd9..a33b859f9 100644
--- a/xbmc/interfaces/builtins/ApplicationBuiltins.cpp
+++ b/xbmc/interfaces/builtins/ApplicationBuiltins.cpp
@@ -21,9 +21,6 @@
#include "ApplicationBuiltins.h"
#include "Application.h"
-#ifdef HAS_FILESYSTEM_RAR
-#include "filesystem/RarManager.h"
-#endif
#include "filesystem/ZipManager.h"
#include "messaging/ApplicationMessenger.h"
#include "input/Key.h"
@@ -49,7 +46,7 @@ using namespace KODI::MESSAGING;
*/
static int Extract(const std::vector<std::string>& params)
{
- // Detects if file is zip or rar then extracts
+ // Detects if file is zip then extracts
std::string strDestDirect;
if (params.size() < 2)
strDestDirect = URIUtils::GetDirectory(params[0]);
@@ -60,10 +57,6 @@ static int Extract(const std::vector<std::string>& params)
if (URIUtils::IsZIP(params[0]))
g_ZipManager.ExtractArchive(params[0],strDestDirect);
-#ifdef HAS_FILESYSTEM_RAR
- else if (URIUtils::IsRAR(params[0]))
- g_RarManager.ExtractArchive(params[0],strDestDirect);
-#endif
else
CLog::Log(LOGERROR, "Extract, No archive given");
diff --git a/xbmc/system.h b/xbmc/system.h
index 07dfe87e4..a60b4f23b 100644
--- a/xbmc/system.h
+++ b/xbmc/system.h
@@ -81,14 +81,6 @@
#define HAS_MDNS_EMBEDDED
#endif
-/**********************
- * Non-free Components
- **********************/
-
-#if defined(HAVE_XBMC_NONFREE)
- #define HAS_FILESYSTEM_RAR
-#endif
-
/*****************
* Win32 Specific
*****************/
|
