summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD25
-rw-r--r--add-arm-targets.patch170
-rw-r--r--add-missing-includes.patch49
-rw-r--r--fix-incompatible-pointers.patch22
-rw-r--r--simplify-makefile.patch73
6 files changed, 166 insertions, 183 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68a6d6a495d6..17bdd25b2290 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vtuner.apps
pkgver = 2.1_gec05cde
- pkgrel = 4
+ pkgrel = 5
url = http://code.google.com/p/vtuner
arch = x86_64
arch = i686
@@ -10,19 +10,23 @@ pkgbase = vtuner.apps
arch = aarch64
license = GPL2
source = vtuner.apps-ec05cde34dd77678933c912a6b4abab5d81b9a5b.tar.gz::https://github.com/lecotex/vtuner.apps/archive/ec05cde34dd77678933c912a6b4abab5d81b9a5b.tar.gz
- source = add-arm-targets.patch
source = vtunerc@.service
source = vtunerd.service
source = vtunerc0
source = vtunerd
source = vtunerc-driver_kmod
+ source = simplify-makefile.patch
+ source = add-missing-includes.patch
+ source = fix-incompatible-pointers.patch
sha256sums = 7a8d3d6e8fc2c97b9f80c1a2208faecfac92aeb3bed863b9b98f66e0a25b1a4b
- sha256sums = 95b6f060a508995d2d11062951963c48435af05f946907b7782982a1213e3631
sha256sums = 870e48fb79b9065b5c98056df1aa6638c4dd3c5340331aed8a91af45f2162477
sha256sums = 9e4568a92caf05b5add190e792b788100aea3aac783ff1681c816a7ac87c631b
sha256sums = ebbc555c1995d9f504f404a671cf36908c59dcd8ab73b0f9886bce9bde985620
sha256sums = 0e443b9c820f8438fb4bdec50a0888269ca6c1e2dd890f50ccbbb353b8dc0a00
sha256sums = 222de6d13132dcde7748cac31b318643fb184e6ebac17d8e9d7602a1d842ea2d
+ sha256sums = aa01e9ff441536924e1a0383f30155ccc376424c38b8f92db560ca2d31b4f2c1
+ sha256sums = f328f903ce71611d5266e0dd17dc0439d31bcbb4ec87f4bd547d2610bd649292
+ sha256sums = 1ac166762bb7d65e2de898eecb73a90066c77baaa7b7a7559bfc8d57510dea62
pkgname = vtuner-client
pkgdesc = VTuner client for the network shared DVB devices
diff --git a/PKGBUILD b/PKGBUILD
index 77b8cdf96293..d08bb60c8d7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,41 +6,46 @@ _gitver=ec05cde34dd77678933c912a6b4abab5d81b9a5b
pkgbase=vtuner.apps
pkgname=('vtuner-client' 'vtuner-server')
pkgver=2.1_gec05cde
-pkgrel=4
+pkgrel=5
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
url='http://code.google.com/p/vtuner'
license=('GPL2')
source=("${pkgbase}-${_gitver}.tar.gz::https://github.com/lecotex/vtuner.apps/archive/${_gitver}.tar.gz"
- 'add-arm-targets.patch'
'vtunerc@.service'
'vtunerd.service'
'vtunerc0'
'vtunerd'
- 'vtunerc-driver_kmod')
+ 'vtunerc-driver_kmod'
+ 'simplify-makefile.patch'
+ 'add-missing-includes.patch'
+ 'fix-incompatible-pointers.patch')
sha256sums=('7a8d3d6e8fc2c97b9f80c1a2208faecfac92aeb3bed863b9b98f66e0a25b1a4b'
- '95b6f060a508995d2d11062951963c48435af05f946907b7782982a1213e3631'
'870e48fb79b9065b5c98056df1aa6638c4dd3c5340331aed8a91af45f2162477'
'9e4568a92caf05b5add190e792b788100aea3aac783ff1681c816a7ac87c631b'
'ebbc555c1995d9f504f404a671cf36908c59dcd8ab73b0f9886bce9bde985620'
'0e443b9c820f8438fb4bdec50a0888269ca6c1e2dd890f50ccbbb353b8dc0a00'
- '222de6d13132dcde7748cac31b318643fb184e6ebac17d8e9d7602a1d842ea2d')
+ '222de6d13132dcde7748cac31b318643fb184e6ebac17d8e9d7602a1d842ea2d'
+ 'aa01e9ff441536924e1a0383f30155ccc376424c38b8f92db560ca2d31b4f2c1'
+ 'f328f903ce71611d5266e0dd17dc0439d31bcbb4ec87f4bd547d2610bd649292'
+ '1ac166762bb7d65e2de898eecb73a90066c77baaa7b7a7559bfc8d57510dea62')
prepare() {
cd ${srcdir}/${pkgbase}-${_gitver}
- patch -p1 -i ${srcdir}/add-arm-targets.patch
- cp Make.config.sample Make.config
+ patch -p1 -i ${srcdir}/simplify-makefile.patch
+ patch -p1 -i ${srcdir}/add-missing-includes.patch
+ patch -p1 -i ${srcdir}/fix-incompatible-pointers.patch
}
build() {
cd ${srcdir}/${pkgbase}-${_gitver}
- make ${CARCH} LOCVER=${pkgver}
+ make LOCVER=${pkgver}
}
package_vtuner-client() {
pkgdesc='VTuner client for the network shared DVB devices'
depends=('vtunerc-dkms')
backup=('etc/conf.d/vtunerc0')
- install -Dm744 ${srcdir}/${pkgbase}-${_gitver}/dist/${CARCH}/vtunerc.${CARCH} ${pkgdir}/usr/bin/vtunerc
+ install -Dm744 ${srcdir}/${pkgbase}-${_gitver}/vtunerc ${pkgdir}/usr/bin/vtunerc
install -Dm644 ${srcdir}/vtunerc@.service ${pkgdir}/usr/lib/systemd/system/vtunerc@.service
install -Dm744 ${srcdir}/vtunerc-driver_kmod ${pkgdir}/usr/lib/systemd/scripts/vtunerc-driver_kmod
install -Dm644 ${srcdir}/vtunerc0 ${pkgdir}/etc/conf.d/vtunerc0
@@ -49,7 +54,7 @@ package_vtuner-client() {
package_vtuner-server() {
pkgdesc='VTuner server for sharing local DVB devices over the network'
backup=('etc/conf.d/vtunerd')
- install -Dm744 ${srcdir}/${pkgbase}-${_gitver}/dist/${CARCH}/vtunerd.${CARCH} ${pkgdir}/usr/bin/vtunerd
+ install -Dm744 ${srcdir}/${pkgbase}-${_gitver}/vtunerd ${pkgdir}/usr/bin/vtunerd
install -Dm644 ${srcdir}/vtunerd.service ${pkgdir}/usr/lib/systemd/system/vtunerd.service
install -Dm644 ${srcdir}/vtunerd ${pkgdir}/etc/conf.d/vtunerd
}
diff --git a/add-arm-targets.patch b/add-arm-targets.patch
deleted file mode 100644
index a035c70cc0d6..000000000000
--- a/add-arm-targets.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/Make.config.sample
-+++ b/Make.config.sample
-@@ -27,4 +27,16 @@ CC-sh4=/opt/STM/STLinux-2.3/devkit/sh4/bin/sh4-linux-gcc
- # define the CC for target arm
- CC-arm=arm-none-linux-gnueabi-gcc
- STRIP-arm=arm-none-linux-gnueabi-strip
--INCLUDE-arm=-I/home/hop/nessie/2.6.22/include
-+INCLUDE-arm=
-+
-+CC-armv6h=arm-unknown-linux-gnueabihf-gcc
-+STRIP-armv6h=arm-unknown-linux-gnueabihf-strip
-+INCLUDE-armv6h=
-+
-+CC-armv7h=arm-unknown-linux-gnueabihf-gcc
-+STRIP-armv7h=arm-unknown-linux-gnueabihf-strip
-+INCLUDE-armv7h=
-+
-+CC-aarch64=aarch64-unknown-linux-gnu-gcc
-+STRIP-aarch64=aarch64-unknown-linux-gnu-strip
-+INCLUDE-aarch64=
---- a/Makefile
-+++ b/Makefile
-@@ -1,35 +1,43 @@
- -include ../../Make.config
-
--all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg
-+all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg arm armv6h armv7h aarch64
-
- i686:
- $(MAKE) -C build/i686 all
--
-+
- x86_64:
- $(MAKE) -C build/x86_64 all
--
--ppc:
-+
-+ppc:
- $(MAKE) -C build/ppc
-
--db2:
-+db2:
- $(MAKE) -C build/db2
-
--mipsel:
-+mipsel:
- $(MAKE) -C build/mipsel all
-
--mipsel15:
-+mipsel15:
- $(MAKE) -C build/mipsel15
--
--sh4:
-+
-+sh4:
- $(MAKE) -C build/sh4 all
-
- ipkg: mipsel
- $(MAKE) -C pkgs ipkg
--
--arm:
-- $(MAKE) -C build/arm
-
--
-+arm:
-+ $(MAKE) -C build/arm all
-+
-+armv6h:
-+ $(MAKE) -C build/armv6h all
-+
-+armv7h:
-+ $(MAKE) -C build/armv7h all
-+
-+aarch64:
-+ $(MAKE) -C build/aarch64 all
-+
- clean:
- $(MAKE) -C build/i686 clean
- $(MAKE) -C build/x86_64 clean
-@@ -40,3 +48,6 @@ clean:
- $(MAKE) -C build/mipsel15 clean
- $(MAKE) -C pkgs clean
- $(MAKE) -C build/arm clean
-+ $(MAKE) -C build/armv6h clean
-+ $(MAKE) -C build/armv7h clean
-+ $(MAKE) -C build/aarch64 clean
---- /dev/null
-+++ b/build/aarch64/Makefile
-@@ -0,0 +1,18 @@
-+ARCH=aarch64
-+-include ../../Make.config
-+
-+CC=$(CC-$(ARCH))
-+CXX=$(CXX-$(ARCH))
-+CFLAGS=-fpic -DHAVE_DVB_API_VERSION=5
-+LDFLAGS=-lpthread -lrt
-+DRIVER=vtuner-dvb-3
-+STRIP=$(STRIP-$(ARCH))
-+
-+all: ../../dist/$(ARCH)/vtunerd.$(ARCH) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+
-+-include ../../Make.rules
-+
-+vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h
-+ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c
---- a/build/arm/Makefile
-+++ b/build/arm/Makefile
-@@ -8,11 +8,11 @@ LDFLAGS=-lpthread -lrt
- DRIVER=vtuner-dvb-3
- STRIP=$(STRIP-$(ARCH))
-
--all: ../../dist/$(ARCH)/vtunerd.$(ARCH)
-- $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH)
--
-+all: ../../dist/$(ARCH)/vtunerd.$(ARCH) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+
- -include ../../Make.rules
--
--vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h
-- $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c
-
-+vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h
-+ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c
---- /dev/null
-+++ b/build/armv6h/Makefile
-@@ -0,0 +1,18 @@
-+ARCH=armv6h
-+-include ../../Make.config
-+
-+CC=$(CC-$(ARCH))
-+CXX=$(CXX-$(ARCH))
-+CFLAGS=-fpic -DHAVE_DVB_API_VERSION=5
-+LDFLAGS=-lpthread -lrt
-+DRIVER=vtuner-dvb-3
-+STRIP=$(STRIP-$(ARCH))
-+
-+all: ../../dist/$(ARCH)/vtunerd.$(ARCH) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+
-+-include ../../Make.rules
-+
-+vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h
-+ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c
---- /dev/null
-+++ b/build/armv7h/Makefile
-@@ -0,0 +1,19 @@
-+ARCH=armv7h
-+-include ../../Make.config
-+
-+CC=$(CC-$(ARCH))
-+CXX=$(CXX-$(ARCH))
-+CFLAGS=-fpic -DHAVE_DVB_API_VERSION=5
-+LDFLAGS=-lpthread -lrt
-+DRIVER=vtuner-dvb-3
-+STRIP=$(STRIP-$(ARCH))
-+
-+all: ../../dist/$(ARCH)/vtunerd.$(ARCH) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerd.$(ARCH)
-+ $(STRIP) ../../dist/$(ARCH)/vtunerc.$(ARCH)
-+
-+-include ../../Make.rules
-+
-+vtuner-dvb-3.o: ../../vtuner-dvb-3.c ../../vtuner-dvb-3.h
-+ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o ../../vtuner-dvb-3.c
-+
diff --git a/add-missing-includes.patch b/add-missing-includes.patch
new file mode 100644
index 000000000000..fc79ea584b2a
--- /dev/null
+++ b/add-missing-includes.patch
@@ -0,0 +1,49 @@
+--- a/vtuner-dvb-3.c
++++ b/vtuner-dvb-3.c
+@@ -1,9 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <poll.h>
++#include <unistd.h>
+
+ #include "vtuner-dvb-3.h"
+
+--- a/vtuner-network.c
++++ b/vtuner-network.c
+@@ -1,6 +1,9 @@
+ #include "vtuner-network.h"
+ #include <string.h>
+ #include <stdio.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <arpa/inet.h>
+
+ #define NTOHB(host,net,field) host->field=net.field
+ #define NTOHS(host,net,field) host->field=ntohs(net.field)
+--- a/vtunerc.c
++++ b/vtunerc.c
+@@ -16,6 +16,7 @@
+ #include <linux/dvb/version.h>
+ #include <time.h>
+ #include <sys/param.h>
++#include <pthread.h>
+
+ #include "vtuner-network.h"
+
+--- a/vtunerd-service.c
++++ b/vtunerd-service.c
+@@ -10,6 +10,10 @@
+ #include <netinet/tcp.h>
+ #include <signal.h>
+ #include <time.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <pthread.h>
++#include <arpa/inet.h>
+
+ #include "vtunerd-service.h"
+
diff --git a/fix-incompatible-pointers.patch b/fix-incompatible-pointers.patch
new file mode 100644
index 000000000000..4d681ccb2013
--- /dev/null
+++ b/fix-incompatible-pointers.patch
@@ -0,0 +1,22 @@
+--- a/vtunerc.c
++++ b/vtunerc.c
+@@ -209,7 +209,7 @@ typedef struct discover_worker_data {
+ unsigned short port;
+ } discover_worker_data_t;
+
+-int *discover_worker(void *d) {
++void *discover_worker(void *d) {
+ discover_worker_data_t* data = (discover_worker_data_t*)d;
+
+ INFO(MSG_MAIN, "starting discover thread\n");
+--- a/vtunerd-service.c
++++ b/vtunerd-service.c
+@@ -37,7 +37,7 @@ int init_vtuner_service(char *ip, unsign
+
+ if( ip && strlen(ip) ) {
+ unsigned long nip;
+- inet_aton(ip, &nip);
++ int inet_aton(const char *ip, struct in_addr *nip);
+ if( nip )
+ listen_ip = ntohl(nip);
+ }
diff --git a/simplify-makefile.patch b/simplify-makefile.patch
new file mode 100644
index 000000000000..580a2a2b8983
--- /dev/null
+++ b/simplify-makefile.patch
@@ -0,0 +1,73 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,42 +1,29 @@
+--include ../../Make.config
+-
+-all: i686 x86_64 mipsel ppc db2 sh4 mipsel15 ipkg
+-
+-i686:
+- $(MAKE) -C build/i686 all
+-
+-x86_64:
+- $(MAKE) -C build/x86_64 all
+-
+-ppc:
+- $(MAKE) -C build/ppc
+-
+-db2:
+- $(MAKE) -C build/db2
+-
+-mipsel:
+- $(MAKE) -C build/mipsel all
+-
+-mipsel15:
+- $(MAKE) -C build/mipsel15
+-
+-sh4:
+- $(MAKE) -C build/sh4 all
+-
+-ipkg: mipsel
+- $(MAKE) -C pkgs ipkg
+-
+-arm:
+- $(MAKE) -C build/arm
+-
+-
++LOCVER := $(shell hg id | tr ' ' / )
++MODFLAG := $(shell if `hg status | grep ^M | grep \.[ch]$$ > /dev/null` ; then echo /dirty ; fi )
++
++CFLAGS += -fPIC -DHAVE_DVB_API_VERSION=5 $(DBGFLAGS)
++LDFLAGS += -lpthread -lrt
++DRIVER = vtuner-dvb-3
++
++default: vtunerd vtunerc
++
++vtuner-dvb-3.o: vtuner-dvb-3.c vtuner-dvb-3.h
++ $(CC) $(CFLAGS) -c -o vtuner-dvb-3.o vtuner-dvb-3.c
++
++vtunerd: vtunerd.c vtunerd-service.o vtuner-network.o vtuner-utils.o $(DRIVER).o
++ $(CC) $(CFLAGS) -DBUILDVER="\"$(LOCVER)\"" -DMODFLAG=\"$(MODFLAG)\" -o vtunerd vtuner-network.o vtunerd-service.o $(DRIVER).o vtuner-utils.o vtunerd.c $(LDFLAGS)
++
++vtunerc: vtunerc.c vtuner-network.o vtuner-utils.o
++ $(CC) $(CFLAGS) -DBUILDVER="\"$(LOCVER)\"" -DMODFLAG=\"$(MODFLAG)\" -o vtunerc vtuner-network.o vtuner-utils.o vtunerc.c $(LDFLAGS)
++
++vtunerd-service.o: vtunerd-service.c vtunerd-service.h
++ $(CC) $(CFLAGS) -c -o vtunerd-service.o vtunerd-service.c
++
++vtuner-network.o: vtuner-network.c vtuner-network.h
++ $(CC) $(CFLAGS) -c -o vtuner-network.o vtuner-network.c
++
++vtuner-utils.o: vtuner-utils.c vtuner-utils.h
++ $(CC) $(CFLAGS) -c -o vtuner-utils.o vtuner-utils.c
++
+ clean:
+- $(MAKE) -C build/i686 clean
+- $(MAKE) -C build/x86_64 clean
+- $(MAKE) -C build/ppc clean
+- $(MAKE) -C build/db2 clean
+- $(MAKE) -C build/mipsel clean
+- $(MAKE) -C build/sh4 clean
+- $(MAKE) -C build/mipsel15 clean
+- $(MAKE) -C pkgs clean
+- $(MAKE) -C build/arm clean
++ rm -rf *.o vtunerd vtunerc