Skip to content

Commit

Permalink
Merge pull request #32 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
Cleanup and API related version increase
  • Loading branch information
AlwinEsch authored Aug 28, 2019
2 parents 73f1994 + 88ec1d7 commit bb9bda3
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 6 deletions.
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# build artifacts
build/
vfs.*/addon.xml

# Debian build files
debian/changelog
debian/files
debian/*.log
debian/*.substvars
debian/.debhelper/
debian/tmp/
debian/kodi-vfs-*/
obj-x86_64-linux-gnu/

# commonly used editors
# vim
*.swp

# Eclipse
*.project
*.cproject
.classpath
*.sublime-*
.settings/

# KDevelop 4
*.kdev4

# gedit
*~

# CLion
/.idea

# clion
.idea/
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

This is a [Kodi](http://kodi.tv) VFS addon to support archives.

[![Build Status](https://travis-ci.org/xbmc/vfs.libarchive.svg?branch=master)](https://travis-ci.org/xbmc/vfs.libarchive)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/vfs.libarchive?svg=true)](https://ci.appveyor.com/project/xbmc/vfs-libarchive)
[![Build Status](https://travis-ci.org/xbmc/vfs.libarchive.svg?branch=Matrix)](https://travis-ci.org/xbmc/vfs.libarchive/branches)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/vfs.libarchive?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/vfs-libarchive?branch=Matrix)

## Build instructions

When building the addon you have to use the correct branch depending on which version of Kodi you're building against.
For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository.
If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename.
Also make sure you follow this README from the branch in question.

### Linux
Expand Down
1 change: 1 addition & 0 deletions depends/common/lz4/lz4.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464
4 changes: 2 additions & 2 deletions src/ArchiveFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static std::string URLEncode(const std::string& strURLData)
return strResult;
}

class CArchiveFile : public kodi::addon::CInstanceVFS
class ATTRIBUTE_HIDDEN CArchiveFile : public kodi::addon::CInstanceVFS
{
struct CbData
{
Expand Down Expand Up @@ -443,7 +443,7 @@ class CArchiveFile : public kodi::addon::CInstanceVFS
}
};

class CMyAddon : public kodi::addon::CAddonBase
class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase
{
public:
CMyAddon() { }
Expand Down
2 changes: 1 addition & 1 deletion vfs.libarchive/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="vfs.libarchive"
version="1.0.5"
version="1.1.0"
name="Archive support"
provider-name="spiff">
<requires>@ADDON_DEPENDS@</requires>
Expand Down

0 comments on commit bb9bda3

Please sign in to comment.