summaryrefslogtreecommitdiff
path: root/net/vls/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/vls/files')
-rw-r--r--net/vls/files/patch-Makefile20
-rw-r--r--net/vls/files/patch-Makefile.dep11
-rw-r--r--net/vls/files/patch-Makefile.module.dep11
-rw-r--r--net/vls/files/patch-configure141
-rw-r--r--net/vls/files/patch-gcc3485
-rw-r--r--net/vls/files/patch-src-core-common.h26
-rw-r--r--net/vls/files/patch-src-core-hashtable.cpp11
-rw-r--r--net/vls/files/vlsd.sh.in22
8 files changed, 0 insertions, 327 deletions
diff --git a/net/vls/files/patch-Makefile b/net/vls/files/patch-Makefile
deleted file mode 100644
index 2767d4125ff0..000000000000
--- a/net/vls/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig Fri Nov 28 22:54:25 2003
-+++ Makefile Sat Dec 27 18:11:03 2003
-@@ -10,6 +10,8 @@
- include Makefile.opts
- endif
-
-+CCFLAGS += ${CFLAGS}
-+
-
- ################################################################################
- # Common options
-@@ -176,7 +178,7 @@
- $(INSTALL) -m 644 $(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
-+ test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist
- @echo "Installation succeeded."
-
- uninstall:
diff --git a/net/vls/files/patch-Makefile.dep b/net/vls/files/patch-Makefile.dep
deleted file mode 100644
index 8f826053bbd9..000000000000
--- a/net/vls/files/patch-Makefile.dep
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.dep.orig Wed Nov 1 16:06:02 2006
-+++ Makefile.dep Wed Nov 1 16:06:35 2006
-@@ -50,7 +50,7 @@
- @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 \
-+ | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o : \
- dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
- [ -s $@ ] || rm -f $@'
-
diff --git a/net/vls/files/patch-Makefile.module.dep b/net/vls/files/patch-Makefile.module.dep
deleted file mode 100644
index 4f17d0a72dea..000000000000
--- a/net/vls/files/patch-Makefile.module.dep
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.module.dep.orig Mon Dec 9 02:55:29 2002
-+++ Makefile.module.dep Wed Nov 1 16:08:15 2006
-@@ -50,7 +50,7 @@
- @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 \
-+ | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o : \
- dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
- [ -s $@ ] || rm -f $@'
-
diff --git a/net/vls/files/patch-configure b/net/vls/files/patch-configure
deleted file mode 100644
index ca3e09c5d08a..000000000000
--- a/net/vls/files/patch-configure
+++ /dev/null
@@ -1,141 +0,0 @@
---- configure.in.orig Fri Nov 28 22:54:25 2003
-+++ configure.in Sat Dec 27 17:35:05 2003
-@@ -309,8 +309,17 @@
- dnl
- AC_ARG_ENABLE(dvd,
- AC_HELP_STRING(--disable-dvd, DVD support (default enabled)))
-+AC_ARG_WITH(dvdread,
-+AC_HELP_STRING(--with-dvdread=[PATH], path to libdvdread))
- if test x$enable_dvd != xno
- then
-+ if test "x$with_dvdread" != x
-+ then
-+ test_CFLAGS="-I${with_dvdread}/include"
-+ fi
-+ save_CPPFLAGS=$CPPFLAGS
-+ save_CFLAGS=$CFLAGS
-+ CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
- AC_CHECK_HEADER(dvdread/dvd_reader.h,
- HAVE_LIBDVDREAD=1, HAVE_LIBDVDREAD=0)
- if test ${HAVE_LIBDVDREAD} = 1
-@@ -318,16 +327,17 @@
- if test ${SYS} != mingw32
- then
- PLUGINS="${PLUGINS} dvdreader"
-- DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
-+ DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -L${with_dvdread}/lib"
- else
- BUILTINS="${BUILTINS} dvdreader"
-- DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss"
-+ DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss -L${with_dvdread}/lib"
- fi
- else
- AC_MSG_ERROR([The development package for libdvdread is not installed.
- Please install it and try again. Alternatively you can also configure with
- --disable-dvd.])
- fi
-+ CPPFLAGS="$save_CPPFLAGS"
- fi
-
- dnl
-@@ -373,11 +383,11 @@
- CPPFLAGS="$save_CPPFLAGS"
-
- dnl Test for the lib existence
-- if test -f "${with_libdvb}/libdvb.a"
-+ if test -f "${with_libdvb}/lib/libdvb.a"
- then
- DVBINPUT_LIB="${DVBINPUT_LIB} -ldvb"
-- DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}"
-- DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}"
-+ DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}/include"
-+ DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}/lib"
- PLUGINS="${PLUGINS} dvbinput dvbreader"
- else
- AC_MSG_ERROR([cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}])
-@@ -440,7 +450,7 @@
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
- AC_CHECK_HEADERS([dvbpsi/dvbpsi.h],[
-- VLS_LIB="${VLS_LIB} -ldvbpsi"
-+ VLS_LIB="${VLS_LIB} -ldvbpsi -L${with_dvbpsi}/lib"
- CCFLAGS="${CCFLAGS} ${test_CFLAGS}"
- DCFLAGS="${DCFLAGS} ${test_CFLAGS}"
- ],[
---- configure.orig Fri Nov 28 22:54:25 2003
-+++ configure Sat Dec 27 17:36:08 2003
-@@ -846,6 +846,7 @@
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-dvb=PATH path to DVB driver header files
-+ --with-dvdread=PATH path to libdvdread
- --with-libdvb=PATH path to libdvb
- --with-dvbpsi=PATH libdvbpsi headers and libraries
- --with-dvbpsi-tree=PATH libdvbpsi tree for static linking
-@@ -6522,8 +6523,21 @@
- enableval="$enable_dvd"
-
- fi;
-+
-+# Check whether --with-dvdread or --without-dvdread was given.
-+if test "${with_dvdread+set}" = set; then
-+ withval="$with_dvdread"
-+
-+fi;
- if test x$enable_dvd != xno
- then
-+ if test "x$with_dvdread" != x
-+ then
-+ test_CFLAGS="-I${with_dvdread}/include"
-+ fi
-+ save_CPPFLAGS=$CPPFLAGS
-+ save_CFLAGS=$CFLAGS
-+ CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
- if test "${ac_cv_header_dvdread_dvd_reader_h+set}" = set; then
- echo "$as_me:$LINENO: checking for dvdread/dvd_reader.h" >&5
- echo $ECHO_N "checking for dvdread/dvd_reader.h... $ECHO_C" >&6
-@@ -6637,10 +6651,10 @@
- if test ${SYS} != mingw32
- then
- PLUGINS="${PLUGINS} dvdreader"
-- DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
-+ DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -L${with_dvdread}/lib"
- else
- BUILTINS="${BUILTINS} dvdreader"
-- DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss"
-+ DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss -L${with_dvdread}/lib"
- fi
- else
- { { echo "$as_me:$LINENO: error: The development package for libdvdread is not installed.
-@@ -6651,6 +6665,7 @@
- --disable-dvd." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+ CPPFLAGS="$save_CPPFLAGS"
- fi
-
- # Check whether --enable-dvb or --disable-dvb was given.
-@@ -6935,11 +6950,11 @@
-
- CPPFLAGS="$save_CPPFLAGS"
-
-- if test -f "${with_libdvb}/libdvb.a"
-+ if test -f "${with_libdvb}/lib/libdvb.a"
- then
- DVBINPUT_LIB="${DVBINPUT_LIB} -ldvb"
-- DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}"
-- DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}"
-+ DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}/include"
-+ DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}/lib"
- PLUGINS="${PLUGINS} dvbinput dvbreader"
- else
- { { echo "$as_me:$LINENO: error: cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}" >&5
-@@ -7236,7 +7251,7 @@
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
-- VLS_LIB="${VLS_LIB} -ldvbpsi"
-+ VLS_LIB="${VLS_LIB} -ldvbpsi -L${with_dvbpsi}/lib"
- CCFLAGS="${CCFLAGS} ${test_CFLAGS}"
- DCFLAGS="${DCFLAGS} ${test_CFLAGS}"
-
diff --git a/net/vls/files/patch-gcc34 b/net/vls/files/patch-gcc34
deleted file mode 100644
index 618f7eeab4e3..000000000000
--- a/net/vls/files/patch-gcc34
+++ /dev/null
@@ -1,85 +0,0 @@
---- src/core/hashtable.h.orig Fri Oct 8 10:37:06 2004
-+++ src/core/hashtable.h Fri Oct 8 10:37:16 2004
-@@ -2,7 +2,7 @@
- * hashtable.h: Hashtable class definition
- *-------------------------------------------------------------------------------
- * (c)1999-2001 VideoLAN
--* $Id: hashtable.h,v 1.1 2001/10/06 21:23:36 bozo Exp $
-+* $Id$
- *
- * Authors: Benoit Steiner <benny@via.ecp.fr>
- *
-@@ -63,7 +63,7 @@
- };
-
-
--class C_HashMethod<u32>
-+template <> class C_HashMethod<u32>
- {
- public:
- inline C_HashMethod(u32 uiMaxHash);
-@@ -76,7 +76,7 @@
- };
-
-
--class C_HashMethod<u16>
-+template <> class C_HashMethod<u16>
- {
- public:
- inline C_HashMethod(u32 uiMaxHash);
-@@ -89,7 +89,7 @@
- };
-
-
--class C_HashMethod<handle>
-+template <> class C_HashMethod<handle>
- {
- public:
- inline C_HashMethod(u32 uiMaxHash);
---- src/core/library.cpp.orig Fri Oct 8 10:49:59 2004
-+++ src/core/library.cpp Fri Oct 8 10:51:20 2004
-@@ -34,6 +34,7 @@
- // use the template: look at vector.h for further explanation
-
-
-+#define DL_LAZY 1
-
- //******************************************************************************
- // class C_Library
---- src/core/stream.cpp.orig Fri Oct 8 11:03:00 2004
-+++ src/core/stream.cpp Fri Oct 8 11:04:48 2004
-@@ -2,7 +2,7 @@
- * stream.cpp: Stream class
- *-------------------------------------------------------------------------------
- * (c)1999-2001 VideoLAN
--* $Id: stream.cpp,v 1.3 2002/09/04 10:56:34 jpsaman Exp $
-+* $Id$
- *
- * Authors: Benoit Steiner <benny@via.ecp.fr>
- *
-@@ -319,7 +319,7 @@
- {
- try
- {
-- u32 iByteCount = cSerializer.NextBytesCount();
-+ u32 iByteCount = this->cSerializer.NextBytesCount();
- while(iByteCount > 0)
- {
- const byte aBytes[iByteCount];
-@@ -332,13 +332,13 @@
- 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/net/vls/files/patch-src-core-common.h b/net/vls/files/patch-src-core-common.h
deleted file mode 100644
index 8a8e3401520f..000000000000
--- a/net/vls/files/patch-src-core-common.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/core/common.h.orig Fri Nov 28 22:54:22 2003
-+++ src/core/common.h Sat Dec 27 18:47:34 2003
-@@ -75,19 +75,23 @@
- typedef signed char s8;
- typedef signed short s16;
- typedef signed int s32;
-+#ifndef __FreeBSD__
- #ifdef _WIN32
- typedef __int64 s64;
- #else
- typedef signed long long s64;
- #endif
-+#endif
-
- typedef unsigned char u8;
- typedef unsigned short u16;
- typedef unsigned int u32;
-+#ifndef __FreeBSD__
- #ifdef _WIN32
- typedef unsigned __int64 u64;
- #else
- typedef unsigned long long u64;
-+#endif
- #endif
-
- // Byte type
diff --git a/net/vls/files/patch-src-core-hashtable.cpp b/net/vls/files/patch-src-core-hashtable.cpp
deleted file mode 100644
index 8f6d703f8717..000000000000
--- a/net/vls/files/patch-src-core-hashtable.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/hashtable.cpp.orig 2007-07-31 20:20:07.000000000 +0200
-+++ src/core/hashtable.cpp 2007-07-31 20:21:02.000000000 +0200
-@@ -97,7 +97,7 @@
-
- u32 C_HashMethod<handle>::Hash(handle hKey) const
- {
-- return (u32)hKey % m_uiMaxHash;
-+ return (uintptr_t)hKey % m_uiMaxHash;
- }
-
-
diff --git a/net/vls/files/vlsd.sh.in b/net/vls/files/vlsd.sh.in
deleted file mode 100644
index 3145fd090c5a..000000000000
--- a/net/vls/files/vlsd.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: vlsd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-
-. %%RC_SUBR%%
-
-name=vlsd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/bin/vlsd
-required_files=%%PREFIX%%/etc/videolan/vls/vls.cfg
-
-# set default
-vlsd_enable=${vlsd_enable:-"NO"}
-
-load_rc_config $name
-run_rc_command "$1"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 19:49:17 +0000