xbmc-git AUR package: discussion in here please

PAdu92 · 2010-03-03 11:53:30

So for me no revisions after r28229 will compile, I get:

In file included from SFTPDirectory.h:26,
from FactoryDirectory.cpp:94:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:43: erreur: expected ';' before '*' token
FileSFTP.h:44: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'u64' has not been declared
FileSFTP.h:49: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:50: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSFTP.h:60: erreur: expected ';' before '*' token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:97: erreur: expected ';' before '*' token

mandog · 2010-03-03 12:47:44

Just installed xbmc-svn 28276-1 to another 64bt machine installed ok, no errors CDDB works now.
Scripts don't install at all, error script failed, they did in last version.
it also randomly crashes again did not before.

brendan · 2010-03-03 14:28:21

@Haggy - love the package, been using it for quite a while, I understand your want for a discussion thread and no clutter for the AUR thread, but can you link this thread on the package page? Weirdly enough searching "xbmc-svn" doesnt have this thread coming up only "xbmc SVN" does...

Perry3D · 2010-03-03 16:50:03

PAdu92 wrote:

So for me no revisions after r28229 will compile, I get:
In file included from SFTPDirectory.h:26,
from FactoryDirectory.cpp:94:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:43: erreur: expected ';' before '*' token
FileSFTP.h:44: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'u64' has not been declared
FileSFTP.h:49: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:50: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSFTP.h:60: erreur: expected ';' before '*' token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:97: erreur: expected ';' before '*' token

Same error here. Maybe there is a missing dependency?

NobeyamaGP · 2010-03-04 07:01:07

Perry3D wrote:

PAdu92 wrote:
So for me no revisions after r28229 will compile, I get:
In file included from SFTPDirectory.h:26,
from FactoryDirectory.cpp:94:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:43: erreur: expected ';' before '*' token
FileSFTP.h:44: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'u64' has not been declared
FileSFTP.h:49: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:50: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSFTP.h:60: erreur: expected ';' before '*' token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:97: erreur: expected ';' before '*' token
Same error here. Maybe there is a missing dependency?

Same error here too.

brendan · 2010-03-04 16:29:57

are you guys on x64? On i686 here I have had no problem.

PAdu92 · 2010-03-04 18:27:17

yeap 64bit for me

PAdu92 · 2010-03-05 12:16:17

Haggy? help please

clesch · 2010-03-06 14:41:04

FWIW, I'm on x86_64 and never ran into this issue either.

NobeyamaGP · 2010-03-06 17:27:27

brendan wrote:

are you guys on x64? On i686 here I have had no problem.

64 bit here as well.

ottbot · 2010-03-09 23:12:42

I just updated to the latest xbmc-svn, yet I'm still having the problem with DVDs not playing. The simple show up as "empty".

I saw it mentioned both xbmc and xbmc-svn are compatible with libcdio-0.82? Is anyone else still having this problem?

BlackIkeEagle · 2010-03-10 12:07:32

PAdu92 wrote:

So for me no revisions after r28229 will compile, I get:
In file included from SFTPDirectory.h:26,
from FactoryDirectory.cpp:94:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:43: erreur: expected ';' before '*' token
FileSFTP.h:44: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'u64' has not been declared
FileSFTP.h:49: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:50: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSFTP.h:60: erreur: expected ';' before '*' token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:97: erreur: expected ';' before '*' token

are you guys sure you have libmicrohttpd built and installed ?

BlackIkeEagle · 2010-03-10 12:09:18

ottbot wrote:

I just updated to the latest xbmc-svn, yet I'm still having the problem with DVDs not playing. The simple show up as "empty".
I saw it mentioned both xbmc and xbmc-svn are compatible with libcdio-0.82? Is anyone else still having this problem?

the xbmc in community should be working fine with the latest libcdio

xbmc-svn should also be fine because the fix is in the tree for a while now

you might have some quirks here and there, try a few times inserting the dvd

PAdu92 · 2010-03-10 16:27:46

BlackEagle wrote:

PAdu92 wrote:
So for me no revisions after r28229 will compile, I get:
In file included from SFTPDirectory.h:26,
from FactoryDirectory.cpp:94:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:43: erreur: expected ';' before '*' token
FileSFTP.h:44: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:48: erreur: 'u64' has not been declared
FileSFTP.h:49: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:50: erreur: 'SFTP_FILE' has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSFTP.h:60: erreur: expected ';' before '*' token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSFTP.h:97: erreur: expected ';' before '*' token
are you guys sure you have libmicrohttpd built and installed ?

yes, the 4.5....

BlackIkeEagle · 2010-03-11 10:18:29

if i find the time i try to check it out this evening

i build my xbmc-svn different from haggy's pkgbuild and also keep on building after the merge

so i try with the xbmc-svn pkgbuild from aur ( never had any problems with them before since haggy had them tested )

if i get there i give you the results of a clean build.

now i cant test since i'm at work

PAdu92 · 2010-03-11 11:28:11

thanks, but I just tried latest svn r28532 and it compiles fine.....

BlackIkeEagle · 2010-03-12 16:11:30

just tried it for the fun of it, on my machine xbmc-svn 28276 builds fine

clean system , all latest updates , x86_64

vr4b4c · 2010-03-12 21:06:01

Hi,
Does someone have this file http://trac.xbmc.org/raw-attachment/tic … jectM.diff ? As xbmc.org is down and I cant compile xbmc-svn without it..
@haggy maybe to host it with xbmc-svn PKGBUILD file?
Thnx

Edit #1: I found it on archvdr repository https://sourceforge.net/apps/trac/archv … vr-testing

Last edited by vr4b4c (2010-03-13 07:55:00)

.:B:. · 2010-03-15 11:23:06

I can confirm the compilation breaks on 32 bit testing with a similar libSFTP error here; it does compile fine on 32 bit stable though.

PAdu92 · 2010-03-15 11:33:35

I was on 64bit stable......

nuxorg · 2010-03-21 16:12:29

In file included from Application.cpp:103:
FileSFTP.h:43: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSystem/FileSFTP.h:43: virhe: expected ";" before "*" token
FileSystem/FileSFTP.h:44: virhe: "SFTP_FILE" has not been declared
FileSystem/FileSFTP.h:48: virhe: "SFTP_FILE" has not been declared
FileSystem/FileSFTP.h:48: virhe: "u64" has not been declared
FileSystem/FileSFTP.h:49: virhe: "SFTP_FILE" has not been declared
FileSystem/FileSFTP.h:50: virhe: "SFTP_FILE" has not been declared
FileSFTP.h:60: erreur: ISO C++ forbids declaration of 'SFTP_SESSION' with no type
FileSystem/FileSFTP.h:60: virhe: expected ";" before "*" token
FileSFTP.h:97: erreur: ISO C++ forbids declaration of 'SFTP_FILE' with no type
FileSystem/FileSFTP.h:97: virhe: expected ";" before "*" token
make[1]: *** [Application.o] Error 1

I have tried on x64 and i686 system, same outcome for both.

.:B:. · 2010-03-22 17:04:44

You're not using anything from testing? My laptop runs on testing and it breaks there; my server and AppleTV run stable and Xbmc SVN compiles on both.

guisacouto · 2010-03-26 22:43:54

I have installed catalyst-test from AUR, that has support for the new XServer, however now, my XBMC only shows the dominant color in the screen.. no image!

is there a workaround for this?

regards

djselbeck · 2010-03-27 12:39:59

i'm on a stable chroot,too and it does not compile.

EDIT: Found the problem. It is the changed libssh API. Currently i'm trying to backport the change of current XBMC trunk to the last before the branch.

sftp.diff

--- xbmc/FileSystem/FileSFTP.cpp    2010-03-27 15:34:09.373562840 +0100
+++ xbmc/FileSystem/FileSFTP.cpp    2010-03-27 15:34:31.046890651 +0100
@@ -30,6 +30,15 @@
 using namespace XFILE;
 using namespace std;
 
+
+static CStdString CorrectPath(const CStdString path)
+{
+  if(path == "~" || path.Left(2) == "~/")
+    return "./" + path.Mid(2);
+  else
+    return "/" + path;
+}
+
 CSFTPSession::CSFTPSession(const CStdString &host, const CStdString &username, const CStdString &password)
 {
   CLog::Log(LOGINFO, "SFTPSession: Creating new session on host '%s' with user '%s'", host.c_str(), username.c_str());
@@ -46,13 +55,13 @@
   Disconnect();
 }
 
-SFTP_FILE *CSFTPSession::CreateFileHande(const CStdString &file)
+sftp_file CSFTPSession::CreateFileHande(const CStdString &file)
 {
   if (m_connected)
   {
     CSingleLock lock(m_critSect);
     m_LastActive = CTimeUtils::GetTimeMS();
-    SFTP_FILE *handle = sftp_open(m_sftp_session, file.c_str(), O_RDONLY, 0);
+    sftp_file handle = sftp_open(m_sftp_session, CorrectPath(file).c_str(), O_RDONLY, 0);
     if (handle)
     {
       sftp_file_set_blocking(handle);
@@ -67,7 +76,7 @@
   return NULL;
 }
 
-void CSFTPSession::CloseFileHandle(SFTP_FILE *handle)
+void CSFTPSession::CloseFileHandle(sftp_file handle)
 {
   CSingleLock lock(m_critSect);
   sftp_close(handle);
@@ -77,12 +86,12 @@
 {
   if (m_connected)
   {
-    SFTP_DIR *dir = NULL;
+    sftp_dir dir = NULL;
 
     {
       CSingleLock lock(m_critSect);
       m_LastActive = CTimeUtils::GetTimeMS();
-      dir = sftp_opendir(m_sftp_session, folder.size() == 0 ? "./" : folder.c_str());
+      dir = sftp_opendir(m_sftp_session, CorrectPath(folder).c_str());
     }
 
     if (dir)
@@ -90,7 +99,7 @@
       bool read = true;
       while (read)
       {
-        SFTP_ATTRIBUTES *attributes = NULL;
+        sftp_attributes attributes = NULL;
 
         {
           CSingleLock lock(m_critSect);
@@ -98,7 +107,7 @@
           attributes = sftp_readdir(m_sftp_session, dir);
         }
 
-        if (attributes && (strcmp(attributes->name, "..") == 0 || strcmp(attributes->name, ".") == 0))
+        if (attributes && (attributes->name == NULL || strcmp(attributes->name, "..") == 0 || strcmp(attributes->name, ".") == 0))
           continue;
         if (attributes)
         {
@@ -109,11 +118,15 @@
           {
             CSingleLock lock(m_critSect);
             sftp_attributes_free(attributes);
-            char *realpath = sftp_readlink(m_sftp_session, localPath.c_str());
+            char *realpath = sftp_readlink(m_sftp_session, CorrectPath(localPath).c_str());
+            if(realpath == NULL)
+              continue;
             attributes = sftp_stat(m_sftp_session, realpath);
             free(realpath);
             if (attributes == NULL)
               continue;
+            if (attributes && (attributes->name == NULL || strcmp(attributes->name, "..") == 0 || strcmp(attributes->name, ".") == 0))
+              continue;
           }
 
           CFileItemPtr pItem(new CFileItem);
@@ -159,8 +172,7 @@
 bool CSFTPSession::Exists(const char *path)
 {
   CSingleLock lock(m_critSect);
-
-  SFTP_ATTRIBUTES *attributes = sftp_stat(m_sftp_session, path);
+  sftp_attributes attributes = sftp_stat(m_sftp_session, CorrectPath(path).c_str());
   bool exists = attributes != NULL;
 
   if (attributes)
@@ -174,7 +186,7 @@
   CSingleLock lock(m_critSect);
   memset(buffer, 0, sizeof (buffer));
   m_LastActive = CTimeUtils::GetTimeMS();
-  SFTP_ATTRIBUTES *attributes = sftp_stat(m_sftp_session, path);
+  sftp_attributes attributes = sftp_stat(m_sftp_session, CorrectPath(path).c_str());
 
   if (attributes)
   {
@@ -192,21 +204,21 @@
   }
 }
 
-void CSFTPSession::Seek(SFTP_FILE *handle, u64 position)
+void CSFTPSession::Seek(sftp_file handle, uint64_t position)
 {
   CSingleLock lock(m_critSect);
   m_LastActive = CTimeUtils::GetTimeMS();
   sftp_seek64(handle, position);
 }
 
-int CSFTPSession::Read(SFTP_FILE *handle, void *buffer, int64_t length)
+int CSFTPSession::Read(sftp_file handle, void *buffer, size_t length)
 {
   CSingleLock lock(m_critSect);
   m_LastActive = CTimeUtils::GetTimeMS();
   return sftp_read(handle, buffer, length);
 }
 
-int64_t CSFTPSession::GetPosition(SFTP_FILE *handle)
+int64_t CSFTPSession::GetPosition(sftp_file handle)
 {
   CSingleLock lock(m_critSect);
   m_LastActive = CTimeUtils::GetTimeMS();
@@ -218,7 +230,7 @@
   return (CTimeUtils::GetTimeMS() - m_LastActive) > 90000;
 }
 
-bool CSFTPSession::VerifyKnownHost(ssh_session *session)
+bool CSFTPSession::VerifyKnownHost(ssh_session session)
 {
   switch (ssh_is_server_known(session))
   {
@@ -262,7 +274,23 @@
     return false;
   }
 
-  SSH_OPTIONS *options = ssh_options_new();
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,4,0)
+  if (ssh_options_set(m_session, SSH_OPTIONS_USER, username.c_str()) < 0)
+  {
+    CLog::Log(LOGERROR, "SFTPSession: Failed to set username '%s' for session", username.c_str());
+    return false;
+  }
+
+  if (ssh_options_set(m_session, SSH_OPTIONS_HOST, host.c_str()) < 0)
+  {
+    CLog::Log(LOGERROR, "SFTPSession: Failed to set host '%s' for session", host.c_str());
+    return false;
+  }
+
+  ssh_options_set(m_session, SSH_OPTIONS_LOG_VERBOSITY, 0);
+
+#else
+  SSH_OPTIONS* options = ssh_options_new();
 
   if (ssh_options_set_username(options, username.c_str()) < 0)
   {
@@ -279,6 +307,7 @@
   ssh_options_set_log_verbosity(options, 0);
 
   ssh_set_options(m_session, options);
+#endif
 
   if(ssh_connect(m_session))
   {
@@ -289,6 +318,7 @@
   if (!VerifyKnownHost(m_session))
     return false;
 
+
   int noAuth = SSH_AUTH_DENIED;
   if ((noAuth = ssh_userauth_none(m_session, NULL)) == SSH_AUTH_ERROR)
   {
@@ -308,7 +338,7 @@
 
   // Try to authenticate with password
   int passwordAuth = SSH_AUTH_DENIED;
-  if (method & SSH_AUTH_METHOD_PASSWORD && (passwordAuth = ssh_userauth_password(m_session, username.c_str(), password.c_str())) == SSH_AUTH_ERROR)
+  if (method & SSH_AUTH_METHOD_PASSWORD && publicKeyAuth != SSH_AUTH_SUCCESS && (passwordAuth = ssh_userauth_password(m_session, username.c_str(), password.c_str())) == SSH_AUTH_ERROR)
   {
     CLog::Log(LOGERROR, "SFTPSession: Failed to authenticate via password '%s'", ssh_get_error(m_session));
     return false;
@@ -430,7 +460,7 @@
 
   if (m_session && m_sftp_handle)
   {
-    u64 position = 0;
+    uint64_t position = 0;
     if (iWhence == SEEK_SET)
       position = iFilePosition;
     else if (iWhence == SEEK_CUR)
@@ -452,7 +482,7 @@
 {
   if (m_session && m_sftp_handle)
   {
-    int rc = m_session->Read(m_sftp_handle, lpBuf, uiBufSize);
+    int rc = m_session->Read(m_sftp_handle, lpBuf, (size_t)uiBufSize);
 
     if (rc > 0)
       return rc;
--- xbmc/FileSystem/FileSFTP.h    2010-03-27 15:33:53.906895676 +0100
+++ xbmc/FileSystem/FileSFTP.h    2010-03-27 15:33:19.143567868 +0100
@@ -34,30 +34,42 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0,3,2)
+#define ssh_session SSH_SESSION
+#endif
+
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0,4,0)
+#define sftp_file SFTP_FILE*
+#define sftp_session SFTP_SESSION*
+#define sftp_attributes SFTP_ATTRIBUTES*
+#define sftp_dir SFTP_DIR*
+#define ssh_session ssh_session*
+#endif
+
 class CSFTPSession
 {
 public:
   CSFTPSession(const CStdString &host, const CStdString &username, const CStdString &password);
   virtual ~CSFTPSession();
 
-  SFTP_FILE *CreateFileHande(const CStdString &file);
-  void CloseFileHandle(SFTP_FILE *handle);
+  sftp_file CreateFileHande(const CStdString &file);
+  void CloseFileHandle(sftp_file handle);
   bool GetDirectory(const CStdString &base, const CStdString &folder, CFileItemList &items);
   bool Exists(const char *path);
   int Stat(const char *path, struct __stat64* buffer);
-  void Seek(SFTP_FILE *handle, u64 position);
-  int Read(SFTP_FILE *handle, void *buffer, int64_t length);
-  int64_t GetPosition(SFTP_FILE *handle);
+  void Seek(sftp_file handle, uint64_t position);
+  int Read(sftp_file handle, void *buffer, size_t length);
+  int64_t GetPosition(sftp_file handle);
   bool IsIdle();
 private:
-  bool VerifyKnownHost(ssh_session *session);
+  bool VerifyKnownHost(ssh_session session);
   bool Connect(const CStdString &host, const CStdString &username, const CStdString &password);
   void Disconnect();
   CCriticalSection m_critSect;
 
   bool m_connected;
-  ssh_session  *m_session;
-  SFTP_SESSION *m_sftp_session;
+  ssh_session  m_session;
+  sftp_session m_sftp_session;
   int m_LastActive;
 };
 
@@ -94,7 +106,7 @@
   private:
     CStdString m_file;
     CSFTPSessionPtr m_session;
-    SFTP_FILE *m_sftp_handle;
+    sftp_file m_sftp_handle;
   };
 }
 #endif

new PKGBUILD:

# Contributors : Ralf Barth <archlinux dot org at haggy dot org>
#
# Original credits go to Edgar Hucek <gimli at dark-green dot com>
# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD

pkgname=xbmc-svn
pkgver=28276
pkgrel=1
pkgdesc="XBMC Media Center from SVN"
provides=('xbmc')
conflicts=('xbmc' 'xbmc-pulse')
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'LGPL')
depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew'
         'hal' 'jasper' 'libgl' 'libjpeg>=7' 'libpng>=1.4' 'libmad' 'libmysqlclient'
         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image>=1.2.10' 'sdl_mixer' 'sqlite3'
         'tre' 'unzip' 'xorg-server' 'libcdio' 'faad2' 'libsamplerate' 'smbclient' 
         'libmms' 'xorg-utils' 'wavpack' 'libmicrohttpd' 'libmpeg2' 'libmodplug'
         'libvdpau')
makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 
             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 
             'bison')
optdepends=('lirc: remote controller support'
            'gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED'
            'avahi: to use zerconf features (remote, etc...)'
            'unrar: access compressed files without unpacking them'
            'devicekit-power: used to trigger suspend functionality')
install=("${pkgname}.install")
source=(
    "FEH.sh" 
    "http://trac.xbmc.org/raw-attachment/ticket/8552/projectM.diff"
    "sftp.diff"
)
noextract=()
md5sums=(
    "c3e2ab79b9965f1a4a048275d5f222c4" 
    "70eed644485de10cb80927bc1a3c77c7"
    "0c2387ee0a4f2ed721b45a4646cb3158"
)
options=(makeflags)

_svnmod=XBMC
_prefix=/usr

build() {

    _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk

    cd ${srcdir}/
    if [ -d $_svnmod/.svn ]; then
        msg "SVN tree found, reverting changes and updating to -r$pkgver"
        (cd $_svnmod && svn revert -R . && make distclean; svn up -r $pkgver) || return 1
    else
        msg "Checking out SVN tree of -r$pkgver"
        svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
    fi

    # Configure XBMC
    #
    # Note on external-libs:
    #   - We cannot use external python because Arch's python was built with
    #     UCS2 unicode support, whereas xbmc expects UCS4 support
    #   - We cannot use Arch's libass because it's incompatible with XBMC's subtitle rendering
    #   - According to an xbmc dev using external/system ffmpeg with xbmc is "pure stupid" :D
    cd "$srcdir/$_svnmod" 

    # Patch for missing projectM presets
    patch -p0 < ../../projectM.diff || return 1
    patch -p0 < ../../sftp.diff || return 1
    # Archlinux Branding by SVN_REV
    export SVN_REV="$pkgver-ARCH"

    # fix lsb_release dependency
    sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp || return 1

    msg "Configuring XBMC" 
    ./bootstrap
    ./configure --prefix=${_prefix} \
                --disable-external-ffmpeg \
                --disable-external-python \
                --disable-external-libass \
                --enable-debug || return 1
  
    # Now (finally) build
    msg "Running make" 
    make || return 1
}

package() {

    cd "$srcdir/$_svnmod"
    msg "Running make install" 
    make prefix=${pkgdir}${_prefix} install || return 1

    # Replace FEH.py with FEH.sh (and thus remove external python dependency)
    install -Dm755 ${srcdir}/FEH.sh \
                   ${pkgdir}${_prefix}/share/xbmc/FEH.sh || return 1

    sed -i -e "s/python \\${_prefix}\/share\/xbmc\/FEH.py \"\$@\"/\\${_prefix}\/share\/xbmc\/FEH.sh/g" \
                   ${pkgdir}${_prefix}/bin/xbmc || return 1

    # lsb_release fix
    sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' \
                   ${pkgdir}${_prefix}/bin/xbmc || return 1

    sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" \
                   ${pkgdir}${_prefix}/bin/xbmc || return 1

    # .desktop files
    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.desktop \
                   ${pkgdir}${_prefix}/share/applications/xbmc.desktop || return 1

    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \
                   ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1

    # Tools
    install -Dm755 ${srcdir}/$_svnmod/xbmc-xrandr \
                   ${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr || return 1

    install -Dm755 ${srcdir}/$_svnmod/tools/TexturePacker/TexturePacker \
                   ${pkgdir}${_prefix}/share/xbmc/ || return 1

    # Licenses
    install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
    for licensef in LICENSE.GPL README.linux copying.txt; do
        mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \
           ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1
    done

    # strip
    find $pkgdir -type f -exec strip {} \; >/dev/null 2>/dev/null
}

Last edited by djselbeck (2010-03-27 15:10:59)

PAdu92 · 2010-03-30 14:13:04

any ideas for latest SVN r28925?

/media/Multimedia/xbmc-svn/src/XBMC/xbmc/lib/libass /media/Multimedia/xbmc-svn/src/XBMC
./configure: line 15958: ./configure: No such file or directory
/media/Multimedia/xbmc-svn/src/XBMC
configure: error: Submodule xbmc/lib/libass failed to configure

Last edited by PAdu92 (2010-03-30 14:13:23)

Arch Linux

#451 2010-03-03 11:53:30

Re: xbmc-git AUR package: discussion in here please

#452 2010-03-03 12:47:44

Re: xbmc-git AUR package: discussion in here please

#453 2010-03-03 14:28:21

Re: xbmc-git AUR package: discussion in here please

#454 2010-03-03 16:50:03

Re: xbmc-git AUR package: discussion in here please

#455 2010-03-04 07:01:07

Re: xbmc-git AUR package: discussion in here please

#456 2010-03-04 16:29:57

Re: xbmc-git AUR package: discussion in here please

#457 2010-03-04 18:27:17

Re: xbmc-git AUR package: discussion in here please

#458 2010-03-05 12:16:17

Re: xbmc-git AUR package: discussion in here please

#459 2010-03-06 14:41:04

Re: xbmc-git AUR package: discussion in here please

#460 2010-03-06 17:27:27

Re: xbmc-git AUR package: discussion in here please

#461 2010-03-09 23:12:42

Re: xbmc-git AUR package: discussion in here please

#462 2010-03-10 12:07:32

Re: xbmc-git AUR package: discussion in here please

#463 2010-03-10 12:09:18

Re: xbmc-git AUR package: discussion in here please

#464 2010-03-10 16:27:46

Re: xbmc-git AUR package: discussion in here please

#465 2010-03-11 10:18:29

Re: xbmc-git AUR package: discussion in here please

#466 2010-03-11 11:28:11

Re: xbmc-git AUR package: discussion in here please

#467 2010-03-12 16:11:30

Re: xbmc-git AUR package: discussion in here please

#468 2010-03-12 21:06:01

Re: xbmc-git AUR package: discussion in here please

#469 2010-03-15 11:23:06

Re: xbmc-git AUR package: discussion in here please

#470 2010-03-15 11:33:35

Re: xbmc-git AUR package: discussion in here please

#471 2010-03-21 16:12:29

Re: xbmc-git AUR package: discussion in here please

#472 2010-03-22 17:04:44

Re: xbmc-git AUR package: discussion in here please

#473 2010-03-26 22:43:54

Re: xbmc-git AUR package: discussion in here please

#474 2010-03-27 12:39:59

Re: xbmc-git AUR package: discussion in here please

#475 2010-03-30 14:13:04

Re: xbmc-git AUR package: discussion in here please

Board footer