diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/Makefile | 3 | ||||
-rw-r--r-- | multimedia/vls/DESCR | 3 | ||||
-rw-r--r-- | multimedia/vls/Makefile | 36 | ||||
-rw-r--r-- | multimedia/vls/PLIST | 5 | ||||
-rw-r--r-- | multimedia/vls/distinfo | 17 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-aa | 19 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ab | 33 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ac | 14 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ad | 14 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ae | 31 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-af | 15 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ag | 30 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ah | 24 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ai | 15 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-aj | 21 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-ak | 43 | ||||
-rw-r--r-- | multimedia/vls/patches/patch-al | 13 |
17 files changed, 1 insertions, 335 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index ed33138e39b..921ad4fba09 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.199 2013/01/22 09:53:46 wiz Exp $ +# $NetBSD: Makefile,v 1.200 2013/01/22 11:41:19 wiz Exp $ # COMMENT= Multimedia utilities @@ -168,7 +168,6 @@ SUBDIR+= ushare SUBDIR+= vlc SUBDIR+= vlc10 SUBDIR+= vlc2 -SUBDIR+= vls SUBDIR+= win32-codecs SUBDIR+= x264-devel SUBDIR+= xanim diff --git a/multimedia/vls/DESCR b/multimedia/vls/DESCR deleted file mode 100644 index 9d32372ef1b..00000000000 --- a/multimedia/vls/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -VLS is part of the VideoLAN project, a full client/server video over IP -solution. The VideoLAN Server aims at broadcasting MPEG (1/2/4, PS/TS) -video streams over any IP network. diff --git a/multimedia/vls/Makefile b/multimedia/vls/Makefile deleted file mode 100644 index 296d14612b7..00000000000 --- a/multimedia/vls/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 09:21:14 asau Exp $ -# - -DISTNAME= vls-0.5.6 -PKGREVISION= 3 -CATEGORIES= net -MASTER_SITES= http://download.videolan.org/pub/videolan/vls/0.5.6/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.videolan.org/ -COMMENT= VideoLAN Server - -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake -GNU_CONFIGURE= yes -# two versions of 0.5.6 out -DIST_SUBDIR= ${PKGNAME_NOREV} - -CONFIGURE_ARGS+= --with-dvbpsi=${BUILDLINK_PREFIX.libdvbpsi} - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" -CXXFLAGS+= -D__STDC_LIMIT_MACROS -.endif - -ALL_ENV+= CCFLAGS=${CXXFLAGS:M*:Q} - -EGDIR= ${PREFIX}/share/examples/vls -CONF_FILES= ${EGDIR}/vls.cfg ${PKG_SYSCONFDIR}/vls.cfg - -.include "../../multimedia/libdvdplay/buildlink3.mk" -.include "../../multimedia/libdvbpsi/buildlink3.mk" -.include "../../multimedia/libdvdread/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vls/PLIST b/multimedia/vls/PLIST deleted file mode 100644 index 82a769b79d4..00000000000 --- a/multimedia/vls/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:08:11 joerg Exp $ -bin/vls -bin/vlsd -lib/videolan/vls/dvdreader.so -share/examples/vls/vls.cfg diff --git a/multimedia/vls/distinfo b/multimedia/vls/distinfo deleted file mode 100644 index eee4d56a461..00000000000 --- a/multimedia/vls/distinfo +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: distinfo,v 1.8 2008/10/02 13:52:02 joerg Exp $ - -SHA1 (vls-0.5.6/vls-0.5.6.tar.gz) = f61acab2d1b9093677de516b63aef534b0cd81b7 -RMD160 (vls-0.5.6/vls-0.5.6.tar.gz) = 5fdcd718db4caa624ad092c4cdddca2fc62b0d15 -Size (vls-0.5.6/vls-0.5.6.tar.gz) = 802901 bytes -SHA1 (patch-aa) = cadf79b4a1244492d48def104590468b52098527 -SHA1 (patch-ab) = 30b9ba716e80972a7d4cb0cf75efc715086812b1 -SHA1 (patch-ac) = bcc44065d4c45db8c96b5ddd307d61242d70f002 -SHA1 (patch-ad) = 1a75b2990c60afdbe47575bfe745be0d86a379c0 -SHA1 (patch-ae) = 7cb52a8e9d7a095ecb01af2ebfdfc639d0886e59 -SHA1 (patch-af) = 5cda5b979012a143345f179c9f95c4e2c709e59f -SHA1 (patch-ag) = 9c45a5be74f46c67caca043a28de7d36bfc9564c -SHA1 (patch-ah) = e3936ced3b16e97a242102f525dfb0bbfd11d33f -SHA1 (patch-ai) = 4fdebf473eb5be7937ef8e5ac7d63e474b9418b3 -SHA1 (patch-aj) = 9e8255f4c45c74a241333511358ca8f14898f2da -SHA1 (patch-ak) = 979c146119af5372eba02d9624e1a10b17474f88 -SHA1 (patch-al) = b07580dfe5c0314bfe6baa26cfef455fca5102fa diff --git a/multimedia/vls/patches/patch-aa b/multimedia/vls/patches/patch-aa deleted file mode 100644 index 65bc8b52787..00000000000 --- a/multimedia/vls/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/03/29 20:29:23 xtraeme Exp $ - ---- Makefile.opts.in.orig 2004-01-16 10:33:13.000000000 +0100 -+++ Makefile.opts.in 2004-01-16 10:33:47.000000000 +0100 -@@ -76,12 +76,12 @@ - CCFLAGS+=-Wall - CCFLAGS+=-D_REENTRANT - CCFLAGS+=-D_FILE_OFFSET_BITS=64 --LCFLAGS+=-D_REENTRANT -+LCFLAGS+=-D_REENTRANT $(LDFLAGS) - - # - # Specific flags - # --CCFLAGS+=-DCONFIG_PATH='"$(sysconfdir)/videolan/vls"' -+CCFLAGS+=-DCONFIG_PATH='"$(sysconfdir)"' - - VLS_LCFLAGS = @VLS_LCFLAGS@ - VLS_LIB = @VLS_LIB@ diff --git a/multimedia/vls/patches/patch-ab b/multimedia/vls/patches/patch-ab deleted file mode 100644 index bb3d8d368f1..00000000000 --- a/multimedia/vls/patches/patch-ab +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/03/29 20:29:23 xtraeme Exp $ - ---- Makefile.orig 2004-01-16 10:27:30.000000000 +0100 -+++ Makefile 2004-01-16 10:30:19.000000000 +0100 -@@ -168,15 +168,15 @@ - ( cd src/modules/$$module && $(MAKE) distclean ) ; done - - install: -- mkdir -p $(DESTDIR)$(bindir) -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(bindir) - $(INSTALL) bin/vls $(DESTDIR)$(bindir) - $(INSTALL) bin/vlsd $(DESTDIR)$(bindir) -- mkdir -p $(DESTDIR)$(libdir)/videolan/vls -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(libdir)/videolan/vls - ifneq (,$(PLUGINS)) -- $(INSTALL) -m 644 $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls -+ $(BSD_INSTALL_DATA) $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls - endif -- mkdir -p $(DESTDIR)$(sysconfdir)/videolan/vls -- test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)/examples/vls -+ test -r $(DESTDIR)$(datadir)/examples/vls/vls.cfg || $(BSD_INSTALL_DATA) vls.cfg $(DESTDIR)$(datadir)/examples/vls - @echo "Installation succeeded." - - uninstall: -@@ -195,7 +195,6 @@ - @test -d bin || mkdir -p bin - $(CXX) $(LCFLAGS) -o bin/$@$(EXEEXT) $(OBJ) $(C_OBJ) $(BUILTINS:%=obj/%.a) $(VLS_LIB) - @test -f bin/vlsd$(EXEEXT) || ln -s $@ bin/$@d$(EXEEXT) -- chmod 755 bin/$@$(EXEEXT) - - dep/server/vls.dpp: src/server/vls_builtins.cpp - diff --git a/multimedia/vls/patches/patch-ac b/multimedia/vls/patches/patch-ac deleted file mode 100644 index 759d711a8fd..00000000000 --- a/multimedia/vls/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/04/29 18:45:00 kristerw Exp $ - ---- src/core/core.h.orig Fri Apr 29 20:25:38 2005 -+++ src/core/core.h Fri Apr 29 20:26:17 2005 -@@ -51,7 +51,9 @@ - - #ifdef PTHREAD_COND_T_IN_PTHREAD_H - #include <pthread.h> // For... thread.h -+# ifdef USE_SEM_T - #include <semaphore.h> // For thread.h -+# endif - #endif - - #ifdef HAVE_DLFCN_H diff --git a/multimedia/vls/patches/patch-ad b/multimedia/vls/patches/patch-ad deleted file mode 100644 index 77d944ad678..00000000000 --- a/multimedia/vls/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/04/29 18:45:00 kristerw Exp $ - ---- src/core/thread.cpp.orig Fri Apr 29 20:24:01 2005 -+++ src/core/thread.cpp Fri Apr 29 20:25:20 2005 -@@ -32,7 +32,9 @@ - - #ifdef PTHREAD_COND_T_IN_PTHREAD_H - #include <pthread.h> -+# ifdef USE_SEM_T - #include <semaphore.h> -+# endif - #include <errno.h> - #elif defined WIN32 - #include <windows.h> diff --git a/multimedia/vls/patches/patch-ae b/multimedia/vls/patches/patch-ae deleted file mode 100644 index 8df92fe8b4d..00000000000 --- a/multimedia/vls/patches/patch-ae +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/01/03 14:04:27 joerg Exp $ - ---- src/core/hashtable.h.orig 2006-01-03 13:42:06.000000000 +0000 -+++ src/core/hashtable.h -@@ -63,7 +63,7 @@ template <class T> class C_HashMethod - }; - - --class C_HashMethod<u32> -+template <> class C_HashMethod<u32> - { - public: - inline C_HashMethod(u32 uiMaxHash); -@@ -76,7 +76,7 @@ class C_HashMethod<u32> - }; - - --class C_HashMethod<u16> -+template <> class C_HashMethod<u16> - { - public: - inline C_HashMethod(u32 uiMaxHash); -@@ -89,7 +89,7 @@ class C_HashMethod<u16> - }; - - --class C_HashMethod<handle> -+template<> class C_HashMethod<handle> - { - public: - inline C_HashMethod(u32 uiMaxHash); diff --git a/multimedia/vls/patches/patch-af b/multimedia/vls/patches/patch-af deleted file mode 100644 index a901455169a..00000000000 --- a/multimedia/vls/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/01/03 14:04:27 joerg Exp $ - ---- src/core/library.cpp.orig 2006-01-03 13:40:01.000000000 +0000 -+++ src/core/library.cpp -@@ -25,7 +25,9 @@ - * - *******************************************************************************/ - -- -+#ifdef HAVE_DLFCN_H -+#include <dlfcn.h> // For library.h -+#endif - - //------------------------------------------------------------------------------ - // Preamble diff --git a/multimedia/vls/patches/patch-ag b/multimedia/vls/patches/patch-ag deleted file mode 100644 index 801db5ddccd..00000000000 --- a/multimedia/vls/patches/patch-ag +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/01/03 14:04:27 joerg Exp $ - ---- src/core/stream.cpp.orig 2006-01-03 13:54:46.000000000 +0000 -+++ src/core/stream.cpp -@@ -319,7 +319,7 @@ template <class IOStream> - { - try - { -- u32 iByteCount = cSerializer.NextBytesCount(); -+ u32 iByteCount = this->cSerializer.NextBytesCount(); - while(iByteCount > 0) - { - const byte aBytes[iByteCount]; -@@ -332,13 +332,13 @@ template <class IOStream> - ASSERT(iRc >= 0 || iRc == FILE_EOF); - iOffset += iRc; - } -- while(iByteCount > 0 && iRc != FILE_EOF); -+ while(iByteCount > 0 && this->iRc != FILE_EOF); - - // Deserialize them -- cSerializer.SetNextBytes(&aBytes); -+ this->cSerializer.SetNextBytes(&aBytes); - - // Next iteration -- iByteCount = cSerializer.NextBytesCount(); -+ iByteCount = this->cSerializer.NextBytesCount(); - } - } - catch(E_Exception e) diff --git a/multimedia/vls/patches/patch-ah b/multimedia/vls/patches/patch-ah deleted file mode 100644 index e06a882e84b..00000000000 --- a/multimedia/vls/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/05/11 17:59:57 joerg Exp $ - ---- Makefile.dep.orig 2006-05-11 14:48:27.000000000 +0000 -+++ Makefile.dep -@@ -48,17 +48,9 @@ default: - - $(DEP): dep/%.dpp: src/%.cpp - @test -d dep/$(dir $*) || mkdir -p dep/$(dir $*) -- @echo "Generating dependancies for $<..." -- @$(SHELL) -ec '$(CXX) $(DCFLAGS) $(INCLUDE) $< \ -- | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o \ -- dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ -- [ -s $@ ] || rm -f $@' -+ touch $@ - - $(C_DEP): dep/%.d: src/%.c - @test -d dep/$(dir $*) || mkdir -p dep/$(dir $*) -- @echo "Generating dependancies for $<..." -- @$(SHELL) -ec '$(CC) $(DCFLAGS) $(INCLUDE) $< \ -- | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o \ -- dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ -- [ -s $@ ] || rm -f $@' -+ touch $@ - diff --git a/multimedia/vls/patches/patch-ai b/multimedia/vls/patches/patch-ai deleted file mode 100644 index bc636203f2d..00000000000 --- a/multimedia/vls/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/05/11 17:59:57 joerg Exp $ - ---- Makefile.module.dep.orig 2006-05-11 14:50:19.000000000 +0000 -+++ Makefile.module.dep -@@ -48,9 +48,5 @@ default: - - $(MODULE_DEP): dep/%.d: %.cpp - @test -d dep/$(dir $*) || mkdir -p dep/$(dir $*) -- @echo "Generating dependancies for $<..." -- @$(SHELL) -ec '$(CXX) $(DCFLAGS) $(MODULE_DCFLAGS) $(INCLUDE) $< \ -- | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ -- dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ -- [ -s $@ ] || rm -f $@' -+ touch $@ - diff --git a/multimedia/vls/patches/patch-aj b/multimedia/vls/patches/patch-aj deleted file mode 100644 index 8f06f18a027..00000000000 --- a/multimedia/vls/patches/patch-aj +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/06/26 11:30:06 rillig Exp $ - -libdvdread needs the definitions from <inttypes.h>. - ---- src/modules/dvdreader/dvdreader.cpp.orig 2002-09-04 12:56:34.000000000 +0200 -+++ src/modules/dvdreader/dvdreader.cpp 2006-06-26 13:27:52.000000000 +0200 -@@ -30,6 +30,14 @@ - //------------------------------------------------------------------------------ - #include "../../core/defs.h" - -+#define __STDC_LIMIT_MACROS -+#if defined(HAVE_INTTYPES_H) -+# include <inttypes.h> -+#endif -+#if defined(HAVE_STDINT_H) -+# include <stdint.h> -+#endif -+ - #include "../../core/core.h" - - #include "../../core/iso_lang.h" diff --git a/multimedia/vls/patches/patch-ak b/multimedia/vls/patches/patch-ak deleted file mode 100644 index 3590fb7d479..00000000000 --- a/multimedia/vls/patches/patch-ak +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2008/10/02 13:52:02 joerg Exp $ - ---- src/core/common.h.orig 2008-10-02 15:44:20.000000000 +0200 -+++ src/core/common.h -@@ -71,28 +71,6 @@ - #include <stl_config.h> - #endif - --// Basic types definitions --typedef signed char s8; --typedef signed short s16; --typedef signed int s32; --#ifdef _WIN32 --typedef __int64 s64; --#else --typedef signed long long s64; --#endif -- --typedef unsigned char u8; --typedef unsigned short u16; --typedef unsigned int u32; --#ifdef _WIN32 --typedef unsigned __int64 u64; --#else --typedef unsigned long long u64; --#endif -- --// Byte type --typedef u8 byte; -- - // Handles - typedef void* handle; - -@@ -131,6 +109,9 @@ typedef unsigned long count; - # endif - #endif - -+// Byte type -+typedef u8 byte; -+ - #if defined( WIN32) - typedef int ssize_t; - #endif diff --git a/multimedia/vls/patches/patch-al b/multimedia/vls/patches/patch-al deleted file mode 100644 index bf82ca41d2c..00000000000 --- a/multimedia/vls/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2008/10/02 13:52:02 joerg Exp $ - ---- src/core/hashtable.cpp.orig 2008-10-02 15:45:19.000000000 +0200 -+++ src/core/hashtable.cpp -@@ -97,7 +97,7 @@ u32 C_HashMethod<u16>::Hash(u16 iKey) co - - u32 C_HashMethod<handle>::Hash(handle hKey) const - { -- return (u32)hKey % m_uiMaxHash; -+ return (u32)(size_t)hKey % m_uiMaxHash; - } - - |