Skip to content

V
vlc
Commit f5c0a050 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./plugins/lirc/lirc.c: IR remote control plugin by Sigmund Augdal 

    <sigmunau@stud.ntnu.no>, activate with --enable-lirc.
  * ./configure.in: put liba52_adec in a builtin for PIC/non-PIC reasons.
parent 5e7b466d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 896 additions and 419 deletions
AUTHORS
View file @ f5c0a050
...@@ -10,6 +10,10 @@ C: marcari ...@@ -10,6 +10,10 @@ C: marcari
E: marcari@via.ecp.fr E: marcari@via.ecp.fr
D: communication with channel server D: communication with channel server
N: Sigmund Augdal
E: sigmunau@idi.ntnu.no
D: lirc plugin
N: Pierre Baillet N: Pierre Baillet
E: oct@zoy.org E: oct@zoy.org
C: octplane C: octplane
......
Makefile
View file @ f5c0a050
...@@ -35,6 +35,7 @@ PLUGINS_DIR := ac3_adec \ ...@@ -35,6 +35,7 @@ PLUGINS_DIR := ac3_adec \
imdct \ imdct \
kde \ kde \
liba52_adec \ liba52_adec \
lirc \
lpcm_adec \ lpcm_adec \
macosx \ macosx \
mad \ mad \
...@@ -95,6 +96,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \ ...@@ -95,6 +96,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
imdct/imdctsse \ imdct/imdctsse \
kde/kde \ kde/kde \
liba52_adec/liba52_adec \ liba52_adec/liba52_adec \
lirc/lirc \
lpcm_adec/lpcm_adec \ lpcm_adec/lpcm_adec \
macosx/macosx \ macosx/macosx \
mad/mad \ mad/mad \
......
Makefile.opts.in
View file @ f5c0a050
...@@ -87,6 +87,7 @@ LIB_KDE = @LIB_KDE@ ...@@ -87,6 +87,7 @@ LIB_KDE = @LIB_KDE@
LIB_LIBA52_ADEC = @LIB_LIBA52_ADEC@ LIB_LIBA52_ADEC = @LIB_LIBA52_ADEC@
LIB_LIBDVDCSS = @LIB_LIBDVDCSS@ LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
LIB_LIBDVDREAD = @LIB_LIBDVDREAD@ LIB_LIBDVDREAD = @LIB_LIBDVDREAD@
LIB_LIRC = @LIB_LIRC@
LIB_MACOSX = @LIB_MACOSX@ LIB_MACOSX = @LIB_MACOSX@
LIB_MAD = @LIB_MAD@ LIB_MAD = @LIB_MAD@
LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@ LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@
......
configure
View file @ f5c0a050
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ f5c0a050
...@@ -1068,8 +1068,8 @@ AC_ARG_ENABLE(liba52, ...@@ -1068,8 +1068,8 @@ AC_ARG_ENABLE(liba52,
if ((test "x$enableval" != "xno") && (test x$SYS != xmingw32)) if ((test "x$enableval" != "xno") && (test x$SYS != xmingw32))
then then
AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_HEADERS(a52dec/a52.h, [
PLUGINS="${PLUGINS} liba52_adec" BUILTINS="${BUILTINS} liba52_adec"
LIB_LIBA52_ADEC="-la52" LIB_LIBA52_ADEC="${LIB_LIBA52_ADEC} -la52"
],[]) ],[])
fi fi
...@@ -1407,6 +1407,21 @@ if test x$enable_xvideo != xno && ...@@ -1407,6 +1407,21 @@ if test x$enable_xvideo != xno &&
CPPFLAGS=$saved_CPPFLAGS) CPPFLAGS=$saved_CPPFLAGS)
fi fi
dnl
dnl Lirc plugin
dnl
AC_ARG_ENABLE(lirc,
[ --enable-lirc lirc support (default disabled)])
if test x$enable_lirc = xyes
then
AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false")
if test x$have_lirc = xtrue
then
PLUGINS="${PLUGINS} lirc"
LIB_LIRC="${LIB_LIRC} -llirc_client"
fi
fi
dnl dnl
dnl ALSA module dnl ALSA module
dnl dnl
...@@ -1514,6 +1529,7 @@ AC_SUBST(LIB_KDE) ...@@ -1514,6 +1529,7 @@ AC_SUBST(LIB_KDE)
AC_SUBST(LIB_LIBA52_ADEC) AC_SUBST(LIB_LIBA52_ADEC)
AC_SUBST(LIB_LIBDVDCSS) AC_SUBST(LIB_LIBDVDCSS)
AC_SUBST(LIB_LIBDVDREAD) AC_SUBST(LIB_LIBDVDREAD)
AC_SUBST(LIB_LIRC)
AC_SUBST(LIB_MACOSX) AC_SUBST(LIB_MACOSX)
AC_SUBST(LIB_MAD) AC_SUBST(LIB_MAD)
AC_SUBST(LIB_MOTIONALTIVEC) AC_SUBST(LIB_MOTIONALTIVEC)
......
debian/changelog
View file @ f5c0a050
...@@ -2,7 +2,7 @@ vlc (0.2.92cvs-1) unstable; urgency=low ...@@ -2,7 +2,7 @@ vlc (0.2.92cvs-1) unstable; urgency=low
* Development branch. * Development branch.
-- Christophe Massiot <massiot@via.ecp.fr> Fri, 7 Dec 2001 20:18:56 +0100 -- Samuel Hocevar <sam@zoy.org> Fri, 7 Dec 2001 20:18:56 +0100
vlc (0.2.92-8) unstable; urgency=high vlc (0.2.92-8) unstable; urgency=high
......
debian/control
View file @ f5c0a050
...@@ -10,9 +10,11 @@ Build-Depends: debhelper (>=2.2.0), ...@@ -10,9 +10,11 @@ Build-Depends: debhelper (>=2.2.0),
libesd0-dev, libesd0-dev,
libsdl1.2-dev (>=1.2.2-3.1), libsdl1.2-dev (>=1.2.2-3.1),
libqt-dev, libqt-dev,
libasound2-dev [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc] (>=0.9.0beta7), libasound2-dev (>=0.9.0beta10a),
libarts-dev, libarts-dev,
libmad0-dev libmad0-dev,
liblircclient-dev,
a52dec-dev
Standards-Version: 3.5.6 Standards-Version: 3.5.6
Package: vlc Package: vlc
...@@ -77,7 +79,7 @@ Description: Esound plugin for vlc ...@@ -77,7 +79,7 @@ Description: Esound plugin for vlc
vlc, the VideoLAN Client. vlc, the VideoLAN Client.
Package: vlc-alsa Package: vlc-alsa
Architecture: alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: ALSA plugin for vlc Description: ALSA plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
...@@ -136,3 +138,20 @@ Description: aRts plugin for vlc ...@@ -136,3 +138,20 @@ Description: aRts plugin for vlc
. .
This plugin adds support for the aRts Sound System to vlc, the This plugin adds support for the aRts Sound System to vlc, the
VideoLAN Client. VideoLAN Client.
Package: vlc-a52
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: A52 plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for liba52 to vlc, the VideoLAN Client.
Package: vlc-lirc
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: lirc plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin is an infrared lirc interface for vlc, the
VideoLAN Client.
debian/rules
View file @ f5c0a050
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
export DH_COMPAT=3 export DH_COMPAT=3
# Compilation options # Compilation options
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad --enable-arts" export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad --enable-arts --enable-alsa --enable-lirc --enable-liba52"
export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared" export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
export VIDDIR="usr/share/videolan" export VIDDIR="usr/share/videolan"
export PIXDIR="usr/share/pixmaps" export PIXDIR="usr/share/pixmaps"
...@@ -25,9 +25,7 @@ build-stamp: ...@@ -25,9 +25,7 @@ build-stamp:
case $(DEB_BUILD_ARCH) in \ case $(DEB_BUILD_ARCH) in \
i386) \ i386) \
ARCH_FLAGS="--enable-alsa --with-glide" ;; \ ARCH_FLAGS="--with-glide" ;; \
alpha|arm|hppa|ia64|m68k|mips|mipsel|powerpc|s390|sparc) \
ARCH_FLAGS="--enable-alsa" ;; \
*) \ *) \
ARCH_FLAGS="" ;; \ ARCH_FLAGS="" ;; \
esac ;\ esac ;\
...@@ -59,11 +57,9 @@ install: build ...@@ -59,11 +57,9 @@ install: build
# make symlinks for packages and install plugins # make symlinks for packages and install plugins
case $(DEB_BUILD_ARCH) in \ case $(DEB_BUILD_ARCH) in \
i386) \ i386) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa glide" ;; \ ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc glide" ;; \
alpha|ia64|m68k|powerpc) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa" ;; \
*) \ *) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad" ;; \ ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc" ;; \
esac ;\ esac ;\
for alias in $$ARCH_ALIASES ; do \ for alias in $$ARCH_ALIASES ; do \
ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \ ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
...@@ -121,9 +117,9 @@ binary-arch: build install ...@@ -121,9 +117,9 @@ binary-arch: build install
dh_installman doc/vlc.1 dh_installman doc/vlc.1
# dh_installinfo # dh_installinfo
# dh_undocumented # dh_undocumented
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad ChangeLog dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog
# libdvdcss start # libdvdcss start
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad ChangeLog.libdvdcss dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog.libdvdcss
# libdvdcss stop # libdvdcss stop
dh_link dh_link
dh_strip dh_strip
...@@ -136,10 +132,8 @@ binary-arch: build install ...@@ -136,10 +132,8 @@ binary-arch: build install
case $(DEB_BUILD_ARCH) in \ case $(DEB_BUILD_ARCH) in \
i386) \ i386) \
ARCH_EXCLUDE="" ;; \ ARCH_EXCLUDE="" ;; \
alpha|arm|hppa|ia64|m68k|mips|mipsel|powerpc|s390|sparc) \
ARCH_EXCLUDE="-Nvlc-glide" ;; \
*) \ *) \
ARCH_EXCLUDE="-Nvlc-glide -Nvlc-alsa" ;; \ ARCH_EXCLUDE="-Nvlc-glide" ;; \
esac ;\ esac ;\
dh_shlibdeps $$ARCH_EXCLUDE ;\ dh_shlibdeps $$ARCH_EXCLUDE ;\
dh_gencontrol $$ARCH_EXCLUDE ;\ dh_gencontrol $$ARCH_EXCLUDE ;\
......
debian/vlc-lirc.dirs 0 → 100644
View file @ f5c0a050
usr/lib/videolan/vlc
usr/share/doc
doc/lirc/example.lircrc 0 → 100644
View file @ f5c0a050
begin
prog = vlc
button = PLAY_UP
config = PLAY
config = PAUSE
end
begin
prog = vlc
button = STOP_UP
config = STOP
end
begin
prog = vlc
button = POWER_UP
config = QUIT
end
begin
prog = vlc
button = SKIP_FORWARD_UP
config = NEXT
end
begin
prog = vlc
button = SKIP_BACKWARD
config = LAST
end
begin
prog = vlc
button = RED_BUTTON_UP
config = FULLSCREEN
end
begin
prog = vlc
button = REWIND_UP
config = SLOW
end
begin
prog = vlc
button = FORWARD_UP
config = FAST
end
include/defs.h.in
View file @ f5c0a050
...@@ -175,6 +175,12 @@ ...@@ -175,6 +175,12 @@
/* Define if you have the <X11/extensions/Xv.h> header file. */ /* Define if you have the <X11/extensions/Xv.h> header file. */
#undef HAVE_X11_EXTENSIONS_XV_H #undef HAVE_X11_EXTENSIONS_XV_H
/* Define if you have the <X11/extensions/dpms.h> header file. */
#undef HAVE_X11_EXTENSIONS_DPMS_H
/* Define if you have the <a52dec/a52.h> header file. */
#undef HAVE_A52DEC_A52_H
/* Define if you have the <argz.h> header file. */ /* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H #undef HAVE_ARGZ_H
...@@ -341,6 +347,9 @@ ...@@ -341,6 +347,9 @@
/* Define if <strings.h> defines strncasecmp. */ /* Define if <strings.h> defines strncasecmp. */
#undef STRNCASECMP_IN_STRINGS_H #undef STRNCASECMP_IN_STRINGS_H
/* Define if <X11/extensions/dpms.h> defines DPMSInfo. */
#undef DPMSINFO_IN_DPMS_H
/* Define if <sys/param.h> defines ntohl. */ /* Define if <sys/param.h> defines ntohl. */
#undef NTOHL_IN_SYS_PARAM_H #undef NTOHL_IN_SYS_PARAM_H
...@@ -404,6 +413,3 @@ ...@@ -404,6 +413,3 @@
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */ /* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#undef SDL_INCLUDE_FILE #undef SDL_INCLUDE_FILE
/* Define if <X11/extensions/dmps.h> defines DPMSInfo. */
#undef DPMSINFO_IN_DPMS_H
plugins/lirc/.cvsignore 0 → 100644
View file @ f5c0a050
.dep
*.lo
*.o.*
*.lo.*
plugins/lirc/Makefile 0 → 100644
View file @ f5c0a050
lirc_SOURCES = lirc.c
plugins/lirc/lirc.c 0 → 100644
View file @ f5c0a050
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment