diff --git a/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe deleted file mode 100644 index aeddf2a5f..000000000 --- a/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation" -HOMEPAGE="http://www.videolan.org/libdvbpsi" -SRC_URI="http://download.videolan.org/pub/libdvbpsi/0.1.7/libdvbpsi-0.1.7.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="af419575719e356b908b0c6946499052" -BUILD() -{ - cd libdvbpsi-0.1.7 - ./bootstrap - ./configure --prefix=`finddir B_COMMON_DIRECTORY` LDFLAGS="-lnetwork" - make -} - -INSTALL() -{ - cd libdvbpsi-0.1.7 - make install -} - -TEST() -{ - cd libdvbpsi-0.1.7 -# make test -# make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2001-2009 VideoLAN" diff --git a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe new file mode 100644 index 000000000..c66846984 --- /dev/null +++ b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe @@ -0,0 +1,76 @@ +SUMMARY="Library for MPEG TS/DVB PSI tables decoding and generation" +DESCRIPTION=" +The libdvbpsi is part of the VideoLAN project, a full MPEG2 \ +client/server solution. The libdvbpsi can also be used with extra \ +programs that need DVB and PSI decoders and generators. +The VideoLAN team decided to write the libdvbpsi to make the VideoLAN \ +Client and the VideoLAN Server capable of demultiplexing a satellite \ +DVB stream. The library aims at making it easy to decode PSI tables \ +(such as PAT, PMT etc.) present in a TS/DVB stream. +" +HOMEPAGE="http://www.videolan.org/libdvbpsi" +COPYRIGHT=" + 2001-2009 VideoLAN + " +LICENSE="GNU LGPL v2.1" +SRC_URI="http://download.videolan.org/pub/libdvbpsi/$portVersion/libdvbpsi-$portVersion.tar.bz2" +CHECKSUM_SHA256="36d9b233306e48b58999e87864253b564e20932ed46a485e44ef7058f1f927e8" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PATCHES="libdvbpsi-$portVersion.patchset" + +PROVIDES=" + libdvbpsi$secondaryArchSuffix = $portVersion compat >= 1 + lib:libdvbpsi$secondaryArchSuffix = 9.0.0 compat >= 9 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + autoreconf -fi + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libdvbpsi + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libdvbpsi${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libdvbpsi$secondaryArchSuffix = 9.0.0 compat >= 9 + " +REQUIRES_devel=" + libdvbpsi$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libdvbpsi/patches/libdvbpsi-0.1.7.patch b/media-libs/libdvbpsi/patches/libdvbpsi-0.1.7.patch deleted file mode 100644 index c700ea4e3..000000000 --- a/media-libs/libdvbpsi/patches/libdvbpsi-0.1.7.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN libdvbpsi-0.1.7/examples/decode_mpeg.c libdvbpsi-0.1.7-haiku/examples/decode_mpeg.c ---- libdvbpsi-0.1.7/examples/decode_mpeg.c 2010-02-12 10:17:47.066584576 +0000 -+++ libdvbpsi-0.1.7-haiku/examples/decode_mpeg.c 2010-12-16 09:59:32.000000000 +0000 -@@ -234,21 +234,21 @@ - #ifdef HAVE_GETTIMEOFDAY - static mtime_t report_PCRPacketTiming( int i_cc, ts_pid_t *ts_pid, - mtime_t i_prev_pcr, mtime_t time_prev, int32_t i_bytes ) -+{ -+ mtime_t time_current; -+ mtime_t tv_delta; -+ struct timeval tv; - #else - static void report_PCRPacketTiming( int i_cc, ts_pid_t *ts_pid, - mtime_t i_prev_pcr, int32_t i_bytes ) --#endif - { -+#endif - mtime_t i_delta = 0; - - /* sequence number and program_id */ - printf( "%.2d %d ", i_cc, ts_pid->i_pid ); - - #ifdef HAVE_GETTIMEOFDAY -- mtime_t time_current; -- mtime_t tv_delta; -- struct timeval tv; -- - /* arrival time of packet */ - gettimeofday( &tv, NULL ); - time_current = ((mtime_t)tv.tv_sec*1000) + ((mtime_t)tv.tv_usec/1000); diff --git a/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset b/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset new file mode 100644 index 000000000..fc9cd4985 --- /dev/null +++ b/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset @@ -0,0 +1,45 @@ +From 1cac5be1c3ba802cb89ebef17f9c22666e2a3384 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 9 Sep 2014 16:24:20 +0000 +Subject: Haiku patch + + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 87e5918..e3555d3 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -34,7 +34,7 @@ if HAVE_SYS_SOCKET_H + decode_mpeg_SOURCES += connect.c connect.h + endif + decode_mpeg_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DDVBPSI_DIST +-decode_mpeg_LDFLAGS = -L../src -ldvbpsi -lm ++decode_mpeg_LDFLAGS = -L../src -ldvbpsi -lnetwork + + decode_bat_SOURCES = decode_bat.c + decode_bat_CPPFLAGS = -DDVBPSI_DIST +diff --git a/examples/decode_mpeg.c b/examples/decode_mpeg.c +index 3583f61..93143d6 100644 +--- a/examples/decode_mpeg.c ++++ b/examples/decode_mpeg.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef HAVE_SYS_TIME_H +diff --git a/examples/dvbinfo/Makefile.am b/examples/dvbinfo/Makefile.am +index b878676..0a2e76c 100644 +--- a/examples/dvbinfo/Makefile.am ++++ b/examples/dvbinfo/Makefile.am +@@ -7,5 +7,5 @@ if HAVE_SYS_SOCKET_H + dvbinfo_SOURCES += tcp.c tcp.h udp.c udp.h + endif + dvbinfo_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -DDVBPSI_DIST +-dvbinfo_LDFLAGS = -L../../src -ldvbpsi -pthread -lm ++dvbinfo_LDFLAGS = -L../../src -ldvbpsi -lnetwork -lbsd + +-- +1.8.3.4 +