May 2009 - rpmfusion-commits

rpms/vagalume/devel vagalume-0.7.1-others.patch, NONE, 1.1 vagalume.spec, 1.5, 1.6

by Michel Alexandre Salim

Author: salimma Update of /cvs/free/rpms/vagalume/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15554/devel Modified Files: vagalume.spec Added Files: vagalume-0.7.1-others.patch Log Message: * Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3 - Enable playback of others' recommendations and tags (upstream bug #4072) vagalume-0.7.1-others.patch: --- NEW FILE vagalume-0.7.1-others.patch --- --- vagalume-0.7.1.orig/src/vgl-main-window.c.others 2009-02-26 09:12:11.000000000 -0500 +++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-13 12:19:23.168774960 -0400 @@ -770,7 +770,7 @@ GtkWidget *play, *stop, *skip, *separ1, *separ2; GtkWidget *stopafter, *love, *ban, *tag, *dorecomm, *addtopls, *dload; GtkWidget *library, *neigh, *loved, *playlist, *recomm, *usertag; - GtkWidget *library2, *neigh2, *loved2, *playlist2; + GtkWidget *library2, *neigh2, *loved2, *playlist2, *recomm2, *usertag2; GtkWidget *managebmk, *bmkartist, *bmktrack; GtkWidget *about; #ifdef USE_HILDON_WINDOW @@ -863,10 +863,14 @@ neigh2 = gtk_menu_item_new_with_label(_("Neighbours...")); loved2 = gtk_menu_item_new_with_label(_("Loved tracks...")); playlist2 = gtk_menu_item_new_with_label(_("Playlist...")); + recomm2 = gtk_menu_item_new_with_label(_("Recommendations...")); + usertag2 = gtk_menu_item_new_with_label(_("Music tagged...")); gtk_menu_shell_append(othersub, library2); gtk_menu_shell_append(othersub, neigh2); gtk_menu_shell_append(othersub, loved2); gtk_menu_shell_append(othersub, playlist2); + gtk_menu_shell_append(othersub, recomm2); + gtk_menu_shell_append(othersub, usertag2); g_signal_connect(G_OBJECT(library2), "activate", G_CALLBACK(others_radio_selected), GINT_TO_POINTER(LASTFM_LIBRARY_RADIO)); @@ -879,6 +883,12 @@ g_signal_connect(G_OBJECT(playlist2), "activate", G_CALLBACK(others_radio_selected), GINT_TO_POINTER(LASTFM_USERPLAYLIST_RADIO)); + g_signal_connect(G_OBJECT(recomm2), "activate", + G_CALLBACK(others_radio_selected), + GINT_TO_POINTER(LASTFM_RECOMMENDED_RADIO)); + g_signal_connect(G_OBJECT(usertag2), "activate", + G_CALLBACK(others_radio_selected), + GINT_TO_POINTER(LASTFM_USERTAG_RADIO)); /* Actions */ actions = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Actions"))); --- vagalume-0.7.1.orig/src/controller.c.other 2009-02-26 09:07:31.000000000 -0500 +++ vagalume-0.7.1.orig/src/controller.c 2009-05-13 12:31:12.382534553 -0400 @@ -1448,13 +1448,34 @@ _("Play this user's radio"), friends, previous); - if (user != NULL) { + if (user == NULL) return; + + /* Store the new value for later use */ + g_free(previous); + previous = user; + + if (type == LASTFM_RECOMMENDED_RADIO) { + url = lastfm_recommended_radio_url( + user, 100); + } else if (type == LASTFM_USERTAG_RADIO) { + static char *previoustag = NULL; + char *tag; + tag = ui_input_dialog_with_list( + vgl_main_window_get_window(mainwin, TRUE), + _("Enter tag"), _("Enter one of your tags"), + usertags, previoustag); + if (tag != NULL) { + url = lastfm_usertag_radio_url(user, tag); + /* Store the new value for later use */ + g_free(previoustag); + previoustag = tag; + } + } else { url = lastfm_radio_url(type, user); + } + if (url != NULL) { controller_play_radio_by_url(url); g_free(url); - /* Store the new value for later use */ - g_free(previous); - previous = user; } } Index: vagalume.spec =================================================================== RCS file: /cvs/free/rpms/vagalume/devel/vagalume.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vagalume.spec 6 May 2009 00:08:03 -0000 1.5 +++ vagalume.spec 13 May 2009 16:46:58 -0000 1.6 @@ -1,13 +1,15 @@ Name: vagalume Version: 0.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Last.fm client for GNOME and Maemo Group: Applications/Multimedia License: GPLv3 URL: http://vagalume.igalia.com/ Source0: http://vagalume.igalia.com/files/source/vagalume_%{version}.orig.tar.gz +# remove patch0 when 0.7.2 is released Patch0: %{name}-0.7.1-border_width.patch +Patch1: %{name}-0.7.1-others.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel gtk2-devel libxml2-devel @@ -47,6 +49,7 @@ %prep %setup -q -n %{name}-%{version}.orig %patch0 -p1 -b .border_width +%patch1 -p1 -b .others %build @@ -93,6 +96,9 @@ %changelog +* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3 +- Enable playback of others' recommendations and tags (upstream bug #4072) + * Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2 - Fix border width (upstream bug #4041)

15 years, 6 months

1
0
0 / 0

rpms/xdtv/F-9 xdtv-2.4.1cvs15-libv4l2.patch, NONE, 1.1 xdtv-2.4.1cvs15-noldffmpeg.patch, NONE, 1.1 xdtv.desktop, NONE, 1.1 xdtv.spec, NONE, 1.1 xdtv_v4l-conf.pam, NONE, 1.1 xdtv_wizard.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xdtv/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv377/F-9 Modified Files: .cvsignore sources Added Files: xdtv-2.4.1cvs15-libv4l2.patch xdtv-2.4.1cvs15-noldffmpeg.patch xdtv.desktop xdtv.spec xdtv_v4l-conf.pam xdtv_wizard.desktop Log Message: Initial import for F-9 xdtv-2.4.1cvs15-libv4l2.patch: --- NEW FILE xdtv-2.4.1cvs15-libv4l2.patch --- diff -up xdtv-2.4.1cvs15/configure.in.libv4l2 xdtv-2.4.1cvs15/configure.in --- xdtv-2.4.1cvs15/configure.in.libv4l2 2009-03-21 12:53:15.000000000 +0100 +++ xdtv-2.4.1cvs15/configure.in 2009-04-08 16:16:13.000000000 +0200 @@ -4,8 +4,9 @@ dnl ------------------------------------ dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------- -AC_INIT(src/main.c) -AC_PREREQ(2.5) +AC_INIT +AC_CONFIG_SRCDIR([src/main.c]) +AC_PREREQ(2.63) XDTV_MAJOR=2 XDTV_MINOR=4 @@ -19,7 +20,7 @@ AC_SUBST(SPEC_VERSION) PKG_PROG_PKG_CONFIG AM_INIT_AUTOMAKE("xdtv", $XDTV_MAJOR.$XDTV_MINOR.$XDTV_SUB) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) dnl --------------------------------------------------------------------- @@ -191,7 +192,14 @@ AC_C_CONST AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T -AC_STRUCT_ST_RDEV +AC_DIAGNOSE([obsolete],[your code should no longer depend upon `HAVE_ST_RDEV', but +`HAVE_STRUCT_STAT_ST_RDEV'. Remove this warning and +the `AC_DEFINE' when you adjust the code.])dnl +AC_CHECK_MEMBERS([struct stat.st_rdev],[AC_DEFINE(HAVE_ST_RDEV, 1, + [Define to 1 if your `struct stat' has `st_rdev'. + Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' + instead.])]) + AC_HEADER_TIME @@ -213,7 +221,7 @@ if test x$YASM_PROG = xyes; then AC_MSG_CHECKING(for yasm compilation) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ],,YASM_PROG=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ]])],[],[YASM_PROG=no]) AC_MSG_RESULT($YASM_PROG) CFLAGS="$CFLAGS_sau" fi @@ -346,54 +354,54 @@ if test "x$host_arch" = "xi386" || test #mmx assembler non-compilable -> no assembler AC_MSG_CHECKING(for MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms":::"memory") ],, enable_mmx=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms") ],, enable_mmx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms":::"memory") ]])],[],[enable_mmx=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms") ]])],[],[enable_mmx=no]) AC_MSG_RESULT($enable_mmx) #mmxext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence":::"memory") ],, enable_mmxext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence") ],,enable_mmxext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence":::"memory") ]])],[],[enable_mmxext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence") ]])],[],[enable_mmxext=no]) AC_MSG_RESULT($enable_mmxext) #3dnow assembler non-compilable -> no assembler AC_MSG_CHECKING(for 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms":::"memory") ],,enable_3dnow=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms") ],,enable_3dnow=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms":::"memory") ]])],[],[enable_3dnow=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms") ]])],[],[enable_3dnow=no]) AC_MSG_RESULT($enable_3dnow) #3dnowext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ],,enable_3dnowext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ],,enable_3dnowext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ]])],[],[enable_3dnowext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ]])],[],[enable_3dnowext=no]) AC_MSG_RESULT($enable_3dnowext) #sse assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ],,enable_sse=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ],,enable_sse=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ]])],[],[enable_sse=no]) AC_MSG_RESULT($enable_sse) #sse2 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE2 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ],,enable_sse2=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ],,enable_sse2=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse2=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ]])],[],[enable_sse2=no]) AC_MSG_RESULT($enable_sse2) #sse3 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE3 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ],,enable_sse3=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ],,enable_sse3=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse3=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ]])],[],[enable_sse3=no]) AC_MSG_RESULT($enable_sse3) #ebp assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBP support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ],,enable_ebp=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ]])],[],[enable_ebp=no]) AC_MSG_RESULT($enable_ebp) #ebx assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("":::"%ebx") ],,enable_ebx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("":::"%ebx") ]])],[],[enable_ebx=no]) AC_MSG_RESULT($enable_ebx) fi @@ -406,7 +414,7 @@ if test "x$host_arch" = "xsparc" || test AC_MSG_CHECKING(for SPARC vis support with an ASM test) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -mcpu=ultrasparc -mtune=ultrasparc" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ],,enable_vis=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ]])],[],[enable_vis=no]) CFLAGS="$CFLAGS_sau" AC_MSG_RESULT($enable_vis) @@ -712,19 +720,25 @@ dnl video drivers detection case $host_syst in linux) AC_MSG_CHECKING(for video4linux) - AC_TRY_COMPILE([#include <sys/types.h> - #include <linux/videodev.h>],,v4l_ok=yes,v4l_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> + #include <linux/videodev.h>]], [[]])],[v4l_ok=yes],[v4l_ok=no]) if test "x$v4l_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_1,,have video4linux) fi AC_MSG_RESULT($v4l_ok) AC_MSG_CHECKING(for video4linux version 2) - AC_TRY_COMPILE([#include <sys/types.h> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <linux/videodev.h> - #include <linux/videodev2.h>],,v4l2_ok=yes,v4l2_ok=no) + #include <linux/videodev2.h>]], [[]])],[v4l2_ok=yes],[v4l2_ok=no]) if test "x$v4l2_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_2,,have video4linux version 2) + PKG_CHECK_MODULES([LIBV4L2], [libv4l2] , [ + have_libv4l2=yes + AC_DEFINE(HAVE_LIBV4L2,,have video4linux version 2) + ], [ + have_libv4l2=no + ]) fi AC_MSG_RESULT($v4l2_ok) @@ -976,7 +990,7 @@ dnl ------------------------------------ dnl Possibility to link against an external ffmpeg dnl rather than the included one -AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [Use external ffmpeg library])) +AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg],[Use external ffmpeg library])) dnl --------------------------------------------------------------------- dnl Checks for Xpm libraries. @@ -1060,7 +1074,7 @@ AC_SUBST(LIBLIRC) LIBLIRC="" if test "$enable_lirc" != "no"; then AC_MSG_CHECKING(for lirc header files) - AC_TRY_COMPILE([#include <lirc/lirc_client.h>],,lirc_h_ok=yes,lirc_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lirc/lirc_client.h>]], [[]])],[lirc_h_ok=yes],[lirc_h_ok=no]) AC_MSG_RESULT($lirc_h_ok) if test "$lirc_h_ok" = "yes"; then AC_CHECK_LIB(lirc_client, lirc_init, @@ -1087,27 +1101,27 @@ if test "$host_syst" = linux -a "$enable asoundlib="none" AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with alsa/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <alsa/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H,, Alsa headers are in alsa) asoundlib="alsa" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) if test "$asoundlib" != "alsa"; then AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with sys/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <sys/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_SYS_ASOUNDLIB_H,, Alsa headers are in sys) asoundlib="sys" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) fi if test "$asoundlib" = "none"; then @@ -1268,13 +1282,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavcodec (ffmpeg) headers AC_MSG_CHECKING(for libavcodec (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avcodec.h> - ], - [ + ]], [[ AVCodec *codec; AVCodecContext codec_context; - ], libavcodec_header_ok=yes, libavcodec_header_ok=no) + ]])],[libavcodec_header_ok=yes],[libavcodec_header_ok=no]) AC_MSG_RESULT($libavcodec_header_ok) if test x"$libavcodec_header_ok" = xno; then echo "*** Could not find libavcodec (ffmpeg) header files ***" @@ -1284,12 +1297,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavformat (ffmpeg) headers AC_MSG_CHECKING(for libavformat (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avformat.h> #if LIBAVFORMAT_BUILD <= 4608 #error "libavformat too old" #endif - ],, libavformat_header_ok=yes, libavformat_header_ok=no) + ]], [[]])],[libavformat_header_ok=yes],[libavformat_header_ok=no]) AC_MSG_RESULT($libavformat_header_ok) if test "x$libavformat_header_ok" = "xno"; then echo "*** Could not find libavformat (ffmpeg) header files ***" @@ -1323,11 +1336,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg x264 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&x264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&x264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) if test x"$ffmpeg_x264" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libx264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libx264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_x264" != x"no"; then @@ -1342,11 +1353,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg xvid support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&xvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&xvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) if test x"$ffmpeg_xvid" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libxvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libxvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_xvid" != x"no"; then @@ -1361,11 +1370,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg mp3lame support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&mp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&mp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) if test x"$ffmpeg_mp3" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libmp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libmp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_mp3" != x"no"; then @@ -1380,11 +1387,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg aac support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&faac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&faac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) if test x"$ffmpeg_aac" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libfaac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libfaac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_aac" != x"no"; then @@ -1399,8 +1404,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg ac3 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&ac3_encoder)], - ffmpeg_ac3=yes,ffmpeg_ac3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&ac3_encoder)]])],[ffmpeg_ac3=yes],[ffmpeg_ac3=no]) LIBS="$saved_LIBS" if test x"$ffmpeg_ac3" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AC3, 1, ffmpeg is build with the ac3 support) @@ -1414,11 +1418,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_nb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) if test x"$ffmpeg_amr_nb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_nb" != x"no"; then @@ -1433,11 +1435,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_wb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) if test x"$ffmpeg_amr_wb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_wb" != x"no"; then @@ -1453,9 +1453,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg swscale support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avcodec.h>], - [img_convert(0, 0, 0,0,0,0)], - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avcodec.h>]], [[img_convert(0, 0, 0,0,0,0)]])],[enable_ffmpeg_swscale=no],[enable_ffmpeg_swscale=yes]) LIBS="$saved_LIBS" AC_MSG_RESULT($enable_ffmpeg_swscale) @@ -1488,7 +1486,7 @@ dnl find if .align arg is power-of-two o asmalign_pot="unknown" -AC_TRY_COMPILE([asm (".align 3"); ], ,asmalign_pot=yes,asmalign_pot=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm (".align 3"); ]], [[]])],[asmalign_pot=yes],[asmalign_pot=no]) if test x"$asmalign_pot" == xyes; then asmalign_out=`echo \".align\" '#ZEROBITS' \"\\\n\\\t\"` @@ -1506,16 +1504,15 @@ dnl ------------------------------------ dnl Checks for XviD headers AC_MSG_CHECKING(for XviD header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <xvid.h> - ], - [ + ]], [[ #ifdef XVID_API xvid_gbl_init_t xinit; #else XVID_INIT_PARAM *xinit; #endif - ], xvid_header_ok=yes, xvid_header_ok=no) + ]])],[xvid_header_ok=yes],[xvid_header_ok=no]) AC_MSG_RESULT($xvid_header_ok) if test x"$xvid_header_ok" = xno; then @@ -1527,7 +1524,7 @@ dnl ------------------------------------ dnl Checks for XviD API version AC_MSG_CHECKING(if XviD API version is 2.1 or 4.0 or 4.1) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <xvid.h> int main() { #ifdef API_VERSION @@ -1537,7 +1534,7 @@ dnl Checks for XviD API version return 1; #endif #elif defined(XVID_API) - #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) + #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) || XVID_API == XVID_MAKE_API(4, 2) return 0; #else return 1; @@ -1545,13 +1542,11 @@ dnl Checks for XviD API version #else return 1; #endif } - ], - [ + ]])],[ xvid_api_version="yes" - ], - [ + ],[ xvid_api_version="no" - ]) + ],[]) AC_MSG_RESULT($xvid_api_version) if test "$xvid_api_version" = "no"; then @@ -1583,14 +1578,13 @@ dnl Checks for ogg / vorbis / theora hea if test "$enable_ogg" != "no"; then AC_MSG_CHECKING(for ogg-vorbis-theora header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <theora/theora.h> #include <vorbis/codec.h> #include <vorbis/vorbisenc.h> - ], - [ - ], ogg_header_ok=yes, ogg_header_ok=no) + ]], [[ + ]])],[ogg_header_ok=yes],[ogg_header_ok=no]) AC_MSG_RESULT($ogg_header_ok) if test x"$ogg_header_ok" = xno; then @@ -1667,10 +1661,9 @@ dnl Checks for divx4linux headers if test "$enable_divx4linux" != "no"; then AC_MSG_CHECKING(for divx4linux header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <encore2.h> - ], - [ + ]], [[ #if ENCORE_VERSION >= 20021024 DivXBitmapInfoHeader infos; SETTINGS param; @@ -1679,7 +1672,7 @@ if test "$enable_divx4linux" != "no"; th #endif ENC_FRAME fr; ENC_RESULT res; - ], divx_header_ok=yes, divx_header_ok=no) + ]])],[divx_header_ok=yes],[divx_header_ok=no]) AC_MSG_RESULT($divx_header_ok) if test x"$divx_header_ok" = xno; then @@ -1709,12 +1702,11 @@ dnl ------------------------------------ dnl Checks for lame headers AC_MSG_CHECKING(for lame header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lame/lame.h> - ], - [ + ]], [[ lame_global_flags *gfp; - ], lame_header_ok=yes, lame_header_ok=no) + ]])],[lame_header_ok=yes],[lame_header_ok=no]) AC_MSG_RESULT($lame_header_ok) if test x"$lame_header_ok" = xno; then @@ -1793,7 +1785,7 @@ fi if test "$enable_zvbi" != "no"; then AC_MSG_CHECKING(for zvbi header files) - AC_TRY_COMPILE([#include <libzvbi.h>],,zvbi_h_ok=yes,zvbi_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libzvbi.h>]], [[]])],[zvbi_h_ok=yes],[zvbi_h_ok=no]) AC_MSG_RESULT($zvbi_h_ok) if test "$zvbi_h_ok" = "yes"; then CFLAGS_sau="$CFLAGS" @@ -1817,12 +1809,11 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_faac" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for faac header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdlib.h> #include <faac.h> - ], - [ - ],faac_h_ok=yes,faac_h_ok=no) + ]], [[ + ]])],[faac_h_ok=yes],[faac_h_ok=no]) AC_MSG_RESULT($faac_h_ok) if test "$faac_h_ok" == yes; then @@ -1844,14 +1835,13 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_x264" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for x264 header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> #include <inttypes.h> #include <x264.h> - ], - [ + ]], [[ x264_t* try; - ], x264_h_ok=yes, x264_h_ok=no) + ]])],[x264_h_ok=yes],[x264_h_ok=no]) AC_MSG_RESULT($x264_h_ok) if test "$x264_h_ok" == "yes"; then @@ -1875,21 +1865,20 @@ if test "x$with_external_ffmpeg" != "xye dnl ^^ NO NO!! the kernel headers used to compile MUST be the same than dnl the ones which have been used to compile the current glibc !!! dnl see http://lkml.org/lkml/2000/7/27/10 - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <linux/dvb/frontend.h> - ],,dvb_drivers_ok=yes,dvb_drivers_ok=no) + ]], [[]])],[dvb_drivers_ok=yes],[dvb_drivers_ok=no]) AC_MSG_RESULT($dvb_drivers_ok) dnl check for LIBSDL headers AC_MSG_CHECKING(for libsdl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <SDL/SDL.h> #include <SDL/SDL_thread.h> - ], - [ + ]], [[ SDL_mutex *mutex; SDL_cond *cond; - ], libsdl_header_ok=yes, libsdl_header_ok=no) + ]])],[libsdl_header_ok=yes],[libsdl_header_ok=no]) AC_MSG_RESULT($libsdl_header_ok) if test "$libsdl_header_ok" != "no"; then @@ -1906,13 +1895,12 @@ if test "x$with_external_ffmpeg" != "xye dnl check for LIBCURL headers AC_MSG_CHECKING(for libcurl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <curl/curl.h> - ], - [ + ]], [[ CURL *curl; CURLcode res; - ], libcurl_header_ok=yes, libcurl_header_ok=no) + ]])],[libcurl_header_ok=yes],[libcurl_header_ok=no]) AC_MSG_RESULT($libcurl_header_ok) if test "$libcurl_header_ok" != "no"; then @@ -1944,7 +1932,7 @@ dnl ------------------------------------ dnl Check for DBUS DBUS_REQS_MIN=0.35 -AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Use DBUS support]),, with_dbus=auto) +AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[Use DBUS support]),, with_dbus=auto) if test "x$with_dbus" != "xno"; then PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS_MIN, enable_dbus=yes, enable_dbus=no) @@ -2230,13 +2218,10 @@ dnl FFmpeg inside dnl --------------------------------------------------------------- AC_MSG_CHECKING([for socklen_t]) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> - #include <sys/socket.h>], - [socklen_t x;], - [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in], - [AC_MSG_RESULT([no]) ] - ) + #include <sys/socket.h>]], [[socklen_t x;]])],[AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in],[AC_MSG_RESULT([no]) + ]) LIBS="$saved_LIBS" @@ -3398,4 +3383,5 @@ fi dnl --------------------------------------------------------------------- dnl Writing results -AC_OUTPUT(config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile) +AC_CONFIG_FILES([config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile]) +AC_OUTPUT diff -up xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 xdtv-2.4.1cvs15/src/grab-v4l2.c --- xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 2009-04-08 16:16:12.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-v4l2.c 2009-04-08 16:16:12.000000000 +0200 @@ -48,6 +48,18 @@ #include "colorspace.h" #include "memcpy.h" #include "blackborder.h" + +#ifdef HAVE_LIBV4L2 || 1 +# include <libv4l2.h> +#else +# define v4l2_fd_open(fd, flags) (fd) +# define v4l2_open open +# define v4l2_close close +# define v4l2_ioctl ioctl +# define v4l2_mmap mmap +# define v4l2_munmap munmap +#endif + extern int x11_bigendian; static int fmts_xaw_to_v4l2[MAX_VIDEO_FMT] = { @@ -171,14 +183,14 @@ static int grab_open(struct device_t *de if (debug) fprintf (stderr, "v4l2: open\n"); - if (-1 == (bttvfd = open (device->video ? device->video : "/dev/video", O_RDWR))) + if (-1 == (bttvfd = v4l2_open (device->video ? device->video : "/dev/video", O_RDWR))) { - fprintf (stderr, "open %s: %s\n", + fprintf (stderr, "v4l2_open %s: %s\n", device->video ? device->video : "/dev/video", strerror (errno)); goto err; } - if (-1 == ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) { fprintf (stderr, "driver is not v4l2\n"); goto err; @@ -217,7 +229,7 @@ static int grab_open(struct device_t *de for (drv.nfmts = 0; drv.nfmts < MAX_FORMAT; drv.nfmts++) { drv.fmt[drv.nfmts].index = drv.nfmts; drv.fmt[drv.nfmts].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (-1 == ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) break; } @@ -225,22 +237,22 @@ static int grab_open(struct device_t *de ioctl(bttvfd,VIDIOC_G_PARM,&drv.streamparm); drv.brightness.id = V4L2_CID_BRIGHTNESS; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) drv.brightness.id = 0; drv.contrast.id = V4L2_CID_CONTRAST; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) drv.contrast.id = 0; drv.hue.id = V4L2_CID_HUE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) drv.hue.id = 0; drv.saturation.id = V4L2_CID_SATURATION; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) drv.saturation.id = 0; drv.mute.id = V4L2_CID_AUDIO_MUTE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) drv.mute.id = 0; drv.volume.id = V4L2_CID_AUDIO_VOLUME; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || drv.volume.minimum==drv.volume.maximum) drv.volume.id = 0; //exit(0); @@ -272,8 +284,8 @@ static int grab_open(struct device_t *de } /* frame buffer */ - if (-1 == ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { - perror ("ioctl VIDIOC_G_FBUF"); + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { + perror ("v4l2_ioctl VIDIOC_G_FBUF"); fprintf(stderr, "classical overlay is disabled"); ov_error=1; } else { @@ -303,19 +315,19 @@ static int grab_open(struct device_t *de gbformat.fmt.pix.pixelformat = drv.fmt[0].pixelformat; gbformat.fmt.pix.width = 768; gbformat.fmt.pix.height = 576; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) + perror("v4l2_ioctl VIDIOC_S_FMT"); gbformat.fmt.pix.pixelformat = -1; // to force changeformat... return 0; err: if (bttvfd != -1) { - close (bttvfd); + v4l2_close (bttvfd); bttvfd = -1; } if (vbifd != -1) { - close (vbifd); + v4l2_close (vbifd); vbifd = -1; } if(gb2!=NULL) free(gb2); @@ -331,9 +343,9 @@ grab_close () return 0; grab_audio (1, -1, NULL); if(grab) stop_capture(); - close(bttvfd); + v4l2_close(bttvfd); bttvfd = -1; - close(vbifd); + v4l2_close(vbifd); vbifd = -1; free(grab_v4l2.norms); grab_v4l2.norms = NULL; free(grab_v4l2.inputs); grab_v4l2.inputs = NULL; @@ -355,8 +367,8 @@ grab_overlay (int x, int y, int width, i { if (debug) fprintf (stderr, "v4l2: overlay off\n"); - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) + perror("v4l2_ioctl VIDIOC_OVERLAY"); overlay = 0; changeformat(&gbformat); return 0; @@ -385,14 +397,14 @@ grab_overlay (int x, int y, int width, i } } - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &win)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &win)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) { - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { + perror("v4l2_ioctl VIDIOC_OVERLAY"); return -1; } overlay = 1; @@ -409,12 +421,12 @@ grab_queue (struct v4l2_buffer *gb) fprintf (stderr, "g%d", gb->index); if(overlay) {fprintf(stderr,"BIG PB\n");exit(1);} - if (-1 == ioctl (bttvfd, VIDIOC_QBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_QBUF, gb)) { if (errno == EAGAIN) fprintf (stderr, "grabber chip can't sync (no station tuned in?)\n"); else - fprintf (stderr, "ioctl VIDIOC_QBUF(%d): %s\n", + fprintf (stderr, "v4l2_ioctl VIDIOC_QBUF(%d): %s\n", gb->index, strerror (errno)); return -1; } @@ -452,9 +464,9 @@ grab_wait (struct v4l2_buffer *gb) return -1; } - if (-1 == ioctl (bttvfd, VIDIOC_DQBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_DQBUF, gb)) { - perror ("ioctl VIDIOC_DQBUF"); + perror ("v4l2_ioctl VIDIOC_DQBUF"); return -1; } @@ -517,12 +529,12 @@ static int stop_capture(void) { while (gb_grab!=gb_sync) if(grab_wait(&gb2[imgw])<0) {reset(); break;} type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { - perror("ioctl VIDIOC_STREAMOFF"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMOFF"); return -1; } for(i = 0; i < nbufs; i++) - if(maps[i]!=NULL) munmap(maps[i],gb2[i].length); + if(maps[i]!=NULL) v4l2_munmap(maps[i],gb2[i].length); free(maps);free(gb2); maps=NULL; gb2=NULL; grab = 0; @@ -536,8 +548,8 @@ static int start_capture(void) { reqbufs.count = nbufs_default; reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; reqbufs.memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { - perror("ioctl VIDIOC_REQBUFS"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { + perror("v4l2_ioctl VIDIOC_REQBUFS"); return -1; } nbufs = reqbufs.count; @@ -550,22 +562,22 @@ static int start_capture(void) { gb2[i].index = i; gb2[i].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; gb2[i].memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { - perror("ioctl VIDIOC_QUERYBUF"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { + perror("v4l2_ioctl VIDIOC_QUERYBUF"); return -1; } - maps[i] = mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, + maps[i] = v4l2_mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, bttvfd, gb2[i].m.offset); if(maps[i] == MAP_FAILED) { - perror("mmap"); + perror("v4l2_mmap"); return -1; } } type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMON,&type)) { - perror("ioctl VIDIOC_STREAMON"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMON,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMON"); return -1; } grab = 1; @@ -587,8 +599,8 @@ static int changeformat(struct v4l2_form if(fmt->fmt.pix.pixelformat==-1) return -1; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) @@ -643,7 +655,7 @@ grab_tune (const struct CHANNEL* chan) memset(&f,0,sizeof(f)); f.type = V4L2_TUNER_ANALOG_TV; f.frequency = chan->freq; - if(ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) + if(v4l2_ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) perror("VIDIOC_S_FREQUENCY"); return 0; } @@ -654,7 +666,7 @@ grab_tuned () struct v4l2_tuner tuner; memset(&tuner,0,sizeof(tuner)); - if (-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) return 0; return tuner.signal ? 1 : 0; } @@ -666,8 +678,8 @@ grab_input (int input, int norm) if (-1 != input) { if (debug) fprintf (stderr, "v4l2: input: %d\n", input); - if( -1 == ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) - perror("ioctl VIDIOC_S_INPUT"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) + perror("v4l2_ioctl VIDIOC_S_INPUT"); } if (-1 != norm) { @@ -677,8 +689,8 @@ grab_input (int input, int norm) int overlay2 = overlay; if(overlay2) video_overlay (NULL); if(grab) stop_capture(); - if( -1 == ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { - perror("ioctl VIDIOC_S_STD"); + if( -1 == v4l2_ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { + perror("v4l2_ioctl VIDIOC_S_STD"); return -1; } if(overlay2) @@ -701,8 +713,8 @@ static inline int control(int x,struct v if(ctrl->id == 0) return -1; c.id = ctrl->id; c.value = (float)x/65535*(ctrl->maximum-ctrl->minimum)+ctrl->minimum+0.5; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { - perror("ioctl VIDIOC_S_CTRL"); + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { + perror("v4l2_ioctl VIDIOC_S_CTRL"); return -1; } return 0; @@ -726,18 +738,18 @@ grab_audio (int mute, int volume, int *m if(mute !=-1 && drv.mute.id) { c.id = V4L2_CID_AUDIO_MUTE; c.value = mute; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE"); } if(volume !=-1 && drv.volume.id) { c.id = V4L2_CID_AUDIO_VOLUME; c.value = volume; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_VOLUME"); } if(mode) { memset(&tuner,0,sizeof(tuner)); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); if(*mode) { switch(*mode) { @@ -746,9 +758,9 @@ grab_audio (int mute, int volume, int *m case 3: tuner.audmode = V4L2_TUNER_MODE_LANG1; break; case 4: tuner.audmode = V4L2_TUNER_MODE_LANG2; break; } - if(-1 == ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) perror("VIDIOC_S_TUNER"); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); } switch(tuner.audmode) { diff -up xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 xdtv-2.4.1cvs15/src/Makefile.am --- xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 2009-04-08 16:16:11.000000000 +0200 +++ xdtv-2.4.1cvs15/src/Makefile.am 2009-04-08 16:21:29.000000000 +0200 @@ -154,7 +154,7 @@ AM_CFLAGS = @CFLAGPTHREAD@ @DEBUG@ -Wall INCLUDES = -I../alevt -Idvb @FFMPEGINC@ @DBUS_CFLAGS@ -xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ +xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ @LIBV4L2_LIBS@ xdtv_LDFLAGS = -rdynamic @@ -168,7 +168,7 @@ xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @L install-exec-local: install-binPROGRAMS chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf -xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ +xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ @LIBV4L2_LIBS@ xdtv_scantv_SOURCES = xdtv_scantv.c grab-v4l.c grab-v4l2.c strtab.c colorspace.c frequencies.c translation.c xdtv-2.4.1cvs15-noldffmpeg.patch: --- NEW FILE xdtv-2.4.1cvs15-noldffmpeg.patch --- diff -up xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg xdtv-2.4.1cvs15/src/container-ffmpeg.c --- xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg 2009-04-06 21:22:44.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container-ffmpeg.c 2009-04-06 21:25:15.000000000 +0200 @@ -23,16 +23,8 @@ #ifdef HAVE_FFMPEG #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif static AVOutputFormat *av_output_fmt = NULL; static AVFormatContext *oc=NULL; diff -up xdtv-2.4.1cvs15/src/container.h.noldffmpeg xdtv-2.4.1cvs15/src/container.h --- xdtv-2.4.1cvs15/src/container.h.noldffmpeg 2009-04-06 21:20:21.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container.h 2009-04-06 21:20:30.000000000 +0200 @@ -14,11 +14,7 @@ #include "strtab.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #endif enum { diff -up xdtv-2.4.1cvs15/src/divx.h.noldffmpeg xdtv-2.4.1cvs15/src/divx.h --- xdtv-2.4.1cvs15/src/divx.h.noldffmpeg 2009-04-06 21:21:07.000000000 +0200 +++ xdtv-2.4.1cvs15/src/divx.h 2009-04-06 21:21:28.000000000 +0200 @@ -31,17 +31,9 @@ #include "container.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif #endif #endif diff -up xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg xdtv-2.4.1cvs15/src/grab-dvb.c --- xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg 2009-04-06 21:25:47.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-dvb.c 2009-04-06 21:27:11.000000000 +0200 @@ -44,29 +44,12 @@ #include "dvbtools.h" #include "avilib.h" -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> # include <libavcodec/audioconvert.h> -#else -# include "avcodec.h" -# include "audioconvert.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H # include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif -#if HAVE_LIBAVUTIL_COMMON_H # include <libavutil/common.h> -#else -# include "common.h" -#endif #ifdef HAVE_SWSCALE -#if HAVE_LIBSWSCALE_SWSCALE_H # include <libswscale/swscale.h> -#else -# include "swscale.h" -#endif #endif /* because this part of code was moved from mem.h to internal.h */ --- NEW FILE xdtv.desktop --- [Desktop Entry] Name=XdTV Comment=Capture View & Broadcast Video4Linux Streams Comment[fr]=Capturer Visualiser & Diffuser des flux v4l Exec=xdtv Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; --- NEW FILE xdtv.spec --- %define cvs cvs15 Name: xdtv Version: 2.4.1 Release: 0.5%{?cvs}%{?dist} Summary: Video4Linux Stream Capture Viewer & Recorder Group: Applications/Multimedia License: GPLv2+ URL: http://xawdecode.sourceforge.net/ Source0: http://downloads.sourceforge.net/xawdecode/xdtv-%{version}%{?cvs}.tar.gz Source1: xdtv_v4l-conf.pam Source2: xdtv.desktop Source3: xdtv_wizard.desktop Patch0: xdtv-2.4.1cvs15-noldffmpeg.patch Patch1: xdtv-2.4.1cvs15-libv4l2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-server-utils BuildRequires: yasm xterm BuildRequires: libtool automake17 BuildRequires: a52dec-devel BuildRequires: faac-devel BuildRequires: ffmpeg-devel BuildRequires: lame-devel BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: lirc-devel BuildRequires: libpng-devel BuildRequires: libv4l-devel BuildRequires: libvorbis-devel BuildRequires: xvidcore-devel BuildRequires: zvbi-devel BuildRequires: alsa-lib-devel BuildRequires: neXtaw-devel BuildRequires: SDL-devel BuildRequires: curl-devel BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXpm-devel BuildRequires: libXinerama-devel BuildRequires: libXv-devel #Needed for consolehelper Requires: usermode %description XdTV is a software that allows you to to record & watch TV. It interacts with AleVT for Teletext and Nxtvepg for NextView, and uses the video4linux API. It can use some deinterlacing filters and can record video files in various containers (AVI, MPEG, OGG, etc.) with many codecs (FFMpeg(>=0.4.6), XviD(0.9 & 1.x), Ogg Theora (>=1.0alpha5) & Vorbis and DivX4/5). It has also some plugin capabilities. %package devel Summary: Developpement files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: neXtaw-devel Requires: libXt-devel %description devel Developpement files for %{name} %package OSD-font Summary: Font used by %{name} OSD function Group: User Interface/X Requires: %{name} = %{version}-%{release} %description OSD-font Font used by %{name} OSD function. # ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?cvs} # fix flags sed -i -e 's|PERF_FLAGS=|#PERF_FLAGS=|' src/Makefile.am src/Makefile.in # Fix plugdir for lib64 sed -i -e 's|lib/xdtv-plugins|%{_lib}/xdtv-plugins|' src/plugin.c # Convert not UTF-8 files mkdir -p __temp for f in README.ffmpeg README.lirc README.xvid FAQfr-xdtv ;do cp -p $f __temp/$f iconv -f ISO-8859-1 -t UTF-8 __temp/$f > $f touch -r __temp/$f $f done rm -rf __temp #Fix for alevtparams_ui.c sed -i.neXtaw -e 's|X11/Xaw|X11/neXtaw|g' src/*.{c,h} src/devicemanager/devicemanager_ui.c #Patching to remove doubfully support for oldish ffmpeg %patch0 -p1 -b .noldffmpeg %patch1 -p1 -b .libv4l2 #Prevent internal ffmpeg to be used. rm -rf libav* libpostproc libswscale #hack xvidAPI - added in patch1 #sed -i.xvid42 -e 's/4, 0/4, 2/' configure.in configure autoreconf -vif # ----------------------------------------------------------------------------- %build export CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" export CPPFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" %configure --disable-divx4linux \ --enable-arch-detection \ --enable-cpu-options \ --disable-static \ --with-fontdir=%{_datadir}/X11/fonts/misc --enable-smallfont \ --enable-pixmaps \ --with-external-ffmpeg \ --with-dbus make %{?_smp_mflags} # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p " install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' # Make xdtv owns the plugin dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv-plugins # Make xdtv owns the locales dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv # remove the setuid root of this file (need to be root to use it) chmod 0755 $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # xdtv_v4l-conf stuff - inspired from xawtv mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdtv_v4l-conf cat >xdtv_v4l-conf.apps <<! SESSION=true USER=root PROGRAM=%{_sbindir}/xdtv_v4l-conf ! install -m 0644 xdtv_v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xdtv_v4l-conf mv $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # Deprecated rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.dir rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.scale #Icons for i in 16 32 48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps install -pm 0644 %{name}-${i}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done #Desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE2} desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE3} # ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %{_bindir}/update-desktop-database %{_datadir}/applications || : %postun %{_bindir}/update-desktop-database %{_datadir}/applications touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : %post OSD-font if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi %postun OSD-font if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING INSTALL FAQfr-xdtv TODO %doc README README.dvb README.record README.bs README.ffmpeg README.streaming %doc README.bsd README.gentoo README.xvid README.buildme README.lirc %doc README.deinterlace README.plugins ChangeLog lisez-moi xdtvrc.sample %doc lircrc.miro.sample lircrc.hauppauge.sample lircrc.animax.sample %doc lircrc.WinfastTV2000.sample %{_sbindir}/xdtv_v4l-conf %{_bindir}/xdtv* %{_datadir}/X11/app-defaults/XdTV %config %{_sysconfdir}/pam.d/xdtv_v4l-conf %config %{_sysconfdir}/security/console.apps/xdtv_v4l-conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en.conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en-UTF8.conf %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/xdtv/ %{_datadir}/applications/*xdtv.desktop %{_datadir}/applications/*xdtv_wizard.desktop %{_mandir}/man1/*.1.gz # Directory for plugins %dir %{_libdir}/xdtv-plugins # Directory for locales %dir %{_libdir}/xdtv %files devel %defattr(-,root,root,-) %{_includedir}/%{name}/ %files OSD-font %defattr(-,root,root,-) %{_datadir}/X11/fonts/misc/*.pcf.gz %changelog * Wed Apr 8 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.5cvs15 - Add libv4l2 support - Fix xvidcore API 4.2 - Remove hardcoded PERF_FLAGS - Add desktop files in SOURCE * Mon Apr 6 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.4cvs15 - Update to 2.4.1cvs15 * Mon Jan 5 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.3cvs14 - Update to 2.4.1cvs14 * Mon Oct 14 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.2cvs13 - Add PAM support - picked from xawtv (instead of having xdtv_v4l-conf to be setuid root) - Re-order configure options - Only use neXtaw instead of Xaw * Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs13 - Update to 2.4.1cvs13 * Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs12 - Update to 2.4.1cvs12 * Tue Mar 25 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs8 - Update to 2.4.1cvs8 * Sat Jan 12 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs5 - Update to 2.4.1cvs5 * Thu Dec 6 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs4 - Update to 2.4.1cvs4 * Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs3 - Update to 2.4.1cvs3 * Thu Oct 25 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs2 - Update to pre 2.4.1 cvs2 - Fix the plugin directory on lib64 - Remove info post postun * Mon Feb 27 2007 kwizart < kwizart at gmail.com > - 2.4.0-1 - Update to final 2.4.0 - remove desktop file vendor and add category * Mon Feb 05 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.10.pre0 - Fix compile flags * Wed Jan 3 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.9.pre0 - ffmpeg-rebuild - some patches from gentoo - conform to versioning guidelines - tweak some includes in divx.h - Enabled Optimization * Sun Dec 17 2006 kwizart < kwizart at gmail.com > 2.4.0pre0-8.kwizart.fc6 - Try to use ffmpeg-amr-devel with static lib with xdtv * Sun Dec 10 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-7.kwizart.fc6 - Cleaned spec file. * Sat Nov 11 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-6.kwizart.fc6 - libdir in configure. - cleaned spec file for livna.org. - Now use updated ffmpeg tarball from livna 20061030 src.rpm. - Re-use x264 from livna. * Wed Nov 06 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-5.kwizart.fc6 - New release for fc6 * Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-4.kwizart.FC5 - dropped x264 - recent x264 version won't build with xdtv - man files are in correct place. * Sat Sep 22 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-3.kwizart.FC5 - amr support (amrnb_float amrwb_float). * Sun Sep 16 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-2.kwizart.FC5 - Cleaned $RPM_BUILD_ROOT tags / - Problem with application cache / fixed? * Fri Aug 04 2006 kwizart < kwizart at gmail.com > - switch to livna release * Sat Mar 25 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc5 - 2.3.2 on FC5 - The system app-defaults/ directory for X resources is now /usr/share/X11/app-defaults/ on Fedora Core 5 and for future Red Hat Enterprise Linux systems. - FC5 has modular X. All the libraries that were in xorg-x11-devel now have their own packages and you need to include the -devel packages for the libraries your project is actually using. - all infos here: http://fedora.redhat.com/docs/release-notes/fc5/ - new paths for desktop icons & TV misc fonts & font utils * Sun Mar 19 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc4 - 2.3.2 - fix error with the instalation of the TV fonts (need chkfontpath). - fix error with the path of the ressource file (not the same path than in a Mandriva distro). - fix error with the menu update (the menu was not updated). - fix error with the path of the man files (return back to the old method). * Fri Feb 24 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.1-1fc4 - 2.3.1 - FFmpeg inside XdTV - Add the possibility to compile with amr_nb & amr_wb * Fri Dec 23 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.3.0-1 - 2.3.0 - Compiled with --disable-divx4linux & neXtaw - Spec file updated * Sun Jul 03 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-2 - add the xdtv_wizard menu entry * Fri Jul 01 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-1 - Upgrade to 2.2.0 - Compiled with --disable-divx4linux - Spec file cleanup * Sun Apr 03 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.1.1-1 - Upgrade to 2.1.1 * Sun Jan 02 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.0.1-1 - Upgrade to 2.0.1 - Obsolete xawdecode - Clean up installation instructions * Fri Nov 28 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.2-1 - Upgrade to 1.8.2 * Sat Oct 04 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.1-1 - Upgrade to 1.8.1 * Tue Sep 02 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.0-1 - Initial RPM release. --- NEW FILE xdtv_v4l-conf.pam --- #%PAM-1.0 auth sufficient pam_rootok.so auth required pam_console.so account required pam_permit.so session required pam_permit.so session optional pam_xauth.so --- NEW FILE xdtv_wizard.desktop --- [Desktop Entry] Name=XdTV Wizard Comment=XdTV Wizard Exec=xdtv_wizard Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xdtv/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2009 11:10:52 -0000 1.1 +++ .cvsignore 13 May 2009 12:05:52 -0000 1.2 @@ -0,0 +1 @@ +xdtv-2.4.1cvs15.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/xdtv/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2009 11:10:52 -0000 1.1 +++ sources 13 May 2009 12:05:52 -0000 1.2 @@ -0,0 +1 @@ +890a6c98c904326be88d163cdf602018 xdtv-2.4.1cvs15.tar.gz

15 years, 6 months

1
0
0 / 0

rpms/xdtv/F-10 xdtv-2.4.1cvs15-libv4l2.patch, NONE, 1.1 xdtv-2.4.1cvs15-noldffmpeg.patch, NONE, 1.1 xdtv.desktop, NONE, 1.1 xdtv.spec, NONE, 1.1 xdtv_v4l-conf.pam, NONE, 1.1 xdtv_wizard.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xdtv/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv32547/F-10 Modified Files: .cvsignore sources Added Files: xdtv-2.4.1cvs15-libv4l2.patch xdtv-2.4.1cvs15-noldffmpeg.patch xdtv.desktop xdtv.spec xdtv_v4l-conf.pam xdtv_wizard.desktop Log Message: Initial import for F-10 xdtv-2.4.1cvs15-libv4l2.patch: --- NEW FILE xdtv-2.4.1cvs15-libv4l2.patch --- diff -up xdtv-2.4.1cvs15/configure.in.libv4l2 xdtv-2.4.1cvs15/configure.in --- xdtv-2.4.1cvs15/configure.in.libv4l2 2009-03-21 12:53:15.000000000 +0100 +++ xdtv-2.4.1cvs15/configure.in 2009-04-08 16:16:13.000000000 +0200 @@ -4,8 +4,9 @@ dnl ------------------------------------ dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------- -AC_INIT(src/main.c) -AC_PREREQ(2.5) +AC_INIT +AC_CONFIG_SRCDIR([src/main.c]) +AC_PREREQ(2.63) XDTV_MAJOR=2 XDTV_MINOR=4 @@ -19,7 +20,7 @@ AC_SUBST(SPEC_VERSION) PKG_PROG_PKG_CONFIG AM_INIT_AUTOMAKE("xdtv", $XDTV_MAJOR.$XDTV_MINOR.$XDTV_SUB) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) dnl --------------------------------------------------------------------- @@ -191,7 +192,14 @@ AC_C_CONST AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T -AC_STRUCT_ST_RDEV +AC_DIAGNOSE([obsolete],[your code should no longer depend upon `HAVE_ST_RDEV', but +`HAVE_STRUCT_STAT_ST_RDEV'. Remove this warning and +the `AC_DEFINE' when you adjust the code.])dnl +AC_CHECK_MEMBERS([struct stat.st_rdev],[AC_DEFINE(HAVE_ST_RDEV, 1, + [Define to 1 if your `struct stat' has `st_rdev'. + Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' + instead.])]) + AC_HEADER_TIME @@ -213,7 +221,7 @@ if test x$YASM_PROG = xyes; then AC_MSG_CHECKING(for yasm compilation) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ],,YASM_PROG=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ]])],[],[YASM_PROG=no]) AC_MSG_RESULT($YASM_PROG) CFLAGS="$CFLAGS_sau" fi @@ -346,54 +354,54 @@ if test "x$host_arch" = "xi386" || test #mmx assembler non-compilable -> no assembler AC_MSG_CHECKING(for MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms":::"memory") ],, enable_mmx=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms") ],, enable_mmx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms":::"memory") ]])],[],[enable_mmx=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms") ]])],[],[enable_mmx=no]) AC_MSG_RESULT($enable_mmx) #mmxext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence":::"memory") ],, enable_mmxext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence") ],,enable_mmxext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence":::"memory") ]])],[],[enable_mmxext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence") ]])],[],[enable_mmxext=no]) AC_MSG_RESULT($enable_mmxext) #3dnow assembler non-compilable -> no assembler AC_MSG_CHECKING(for 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms":::"memory") ],,enable_3dnow=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms") ],,enable_3dnow=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms":::"memory") ]])],[],[enable_3dnow=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms") ]])],[],[enable_3dnow=no]) AC_MSG_RESULT($enable_3dnow) #3dnowext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ],,enable_3dnowext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ],,enable_3dnowext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ]])],[],[enable_3dnowext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ]])],[],[enable_3dnowext=no]) AC_MSG_RESULT($enable_3dnowext) #sse assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ],,enable_sse=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ],,enable_sse=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ]])],[],[enable_sse=no]) AC_MSG_RESULT($enable_sse) #sse2 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE2 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ],,enable_sse2=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ],,enable_sse2=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse2=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ]])],[],[enable_sse2=no]) AC_MSG_RESULT($enable_sse2) #sse3 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE3 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ],,enable_sse3=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ],,enable_sse3=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse3=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ]])],[],[enable_sse3=no]) AC_MSG_RESULT($enable_sse3) #ebp assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBP support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ],,enable_ebp=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ]])],[],[enable_ebp=no]) AC_MSG_RESULT($enable_ebp) #ebx assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("":::"%ebx") ],,enable_ebx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("":::"%ebx") ]])],[],[enable_ebx=no]) AC_MSG_RESULT($enable_ebx) fi @@ -406,7 +414,7 @@ if test "x$host_arch" = "xsparc" || test AC_MSG_CHECKING(for SPARC vis support with an ASM test) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -mcpu=ultrasparc -mtune=ultrasparc" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ],,enable_vis=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ]])],[],[enable_vis=no]) CFLAGS="$CFLAGS_sau" AC_MSG_RESULT($enable_vis) @@ -712,19 +720,25 @@ dnl video drivers detection case $host_syst in linux) AC_MSG_CHECKING(for video4linux) - AC_TRY_COMPILE([#include <sys/types.h> - #include <linux/videodev.h>],,v4l_ok=yes,v4l_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> + #include <linux/videodev.h>]], [[]])],[v4l_ok=yes],[v4l_ok=no]) if test "x$v4l_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_1,,have video4linux) fi AC_MSG_RESULT($v4l_ok) AC_MSG_CHECKING(for video4linux version 2) - AC_TRY_COMPILE([#include <sys/types.h> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <linux/videodev.h> - #include <linux/videodev2.h>],,v4l2_ok=yes,v4l2_ok=no) + #include <linux/videodev2.h>]], [[]])],[v4l2_ok=yes],[v4l2_ok=no]) if test "x$v4l2_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_2,,have video4linux version 2) + PKG_CHECK_MODULES([LIBV4L2], [libv4l2] , [ + have_libv4l2=yes + AC_DEFINE(HAVE_LIBV4L2,,have video4linux version 2) + ], [ + have_libv4l2=no + ]) fi AC_MSG_RESULT($v4l2_ok) @@ -976,7 +990,7 @@ dnl ------------------------------------ dnl Possibility to link against an external ffmpeg dnl rather than the included one -AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [Use external ffmpeg library])) +AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg],[Use external ffmpeg library])) dnl --------------------------------------------------------------------- dnl Checks for Xpm libraries. @@ -1060,7 +1074,7 @@ AC_SUBST(LIBLIRC) LIBLIRC="" if test "$enable_lirc" != "no"; then AC_MSG_CHECKING(for lirc header files) - AC_TRY_COMPILE([#include <lirc/lirc_client.h>],,lirc_h_ok=yes,lirc_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lirc/lirc_client.h>]], [[]])],[lirc_h_ok=yes],[lirc_h_ok=no]) AC_MSG_RESULT($lirc_h_ok) if test "$lirc_h_ok" = "yes"; then AC_CHECK_LIB(lirc_client, lirc_init, @@ -1087,27 +1101,27 @@ if test "$host_syst" = linux -a "$enable asoundlib="none" AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with alsa/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <alsa/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H,, Alsa headers are in alsa) asoundlib="alsa" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) if test "$asoundlib" != "alsa"; then AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with sys/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <sys/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_SYS_ASOUNDLIB_H,, Alsa headers are in sys) asoundlib="sys" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) fi if test "$asoundlib" = "none"; then @@ -1268,13 +1282,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavcodec (ffmpeg) headers AC_MSG_CHECKING(for libavcodec (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avcodec.h> - ], - [ + ]], [[ AVCodec *codec; AVCodecContext codec_context; - ], libavcodec_header_ok=yes, libavcodec_header_ok=no) + ]])],[libavcodec_header_ok=yes],[libavcodec_header_ok=no]) AC_MSG_RESULT($libavcodec_header_ok) if test x"$libavcodec_header_ok" = xno; then echo "*** Could not find libavcodec (ffmpeg) header files ***" @@ -1284,12 +1297,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavformat (ffmpeg) headers AC_MSG_CHECKING(for libavformat (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avformat.h> #if LIBAVFORMAT_BUILD <= 4608 #error "libavformat too old" #endif - ],, libavformat_header_ok=yes, libavformat_header_ok=no) + ]], [[]])],[libavformat_header_ok=yes],[libavformat_header_ok=no]) AC_MSG_RESULT($libavformat_header_ok) if test "x$libavformat_header_ok" = "xno"; then echo "*** Could not find libavformat (ffmpeg) header files ***" @@ -1323,11 +1336,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg x264 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&x264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&x264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) if test x"$ffmpeg_x264" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libx264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libx264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_x264" != x"no"; then @@ -1342,11 +1353,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg xvid support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&xvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&xvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) if test x"$ffmpeg_xvid" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libxvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libxvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_xvid" != x"no"; then @@ -1361,11 +1370,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg mp3lame support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&mp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&mp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) if test x"$ffmpeg_mp3" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libmp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libmp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_mp3" != x"no"; then @@ -1380,11 +1387,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg aac support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&faac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&faac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) if test x"$ffmpeg_aac" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libfaac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libfaac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_aac" != x"no"; then @@ -1399,8 +1404,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg ac3 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&ac3_encoder)], - ffmpeg_ac3=yes,ffmpeg_ac3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&ac3_encoder)]])],[ffmpeg_ac3=yes],[ffmpeg_ac3=no]) LIBS="$saved_LIBS" if test x"$ffmpeg_ac3" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AC3, 1, ffmpeg is build with the ac3 support) @@ -1414,11 +1418,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_nb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) if test x"$ffmpeg_amr_nb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_nb" != x"no"; then @@ -1433,11 +1435,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_wb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) if test x"$ffmpeg_amr_wb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_wb" != x"no"; then @@ -1453,9 +1453,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg swscale support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avcodec.h>], - [img_convert(0, 0, 0,0,0,0)], - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avcodec.h>]], [[img_convert(0, 0, 0,0,0,0)]])],[enable_ffmpeg_swscale=no],[enable_ffmpeg_swscale=yes]) LIBS="$saved_LIBS" AC_MSG_RESULT($enable_ffmpeg_swscale) @@ -1488,7 +1486,7 @@ dnl find if .align arg is power-of-two o asmalign_pot="unknown" -AC_TRY_COMPILE([asm (".align 3"); ], ,asmalign_pot=yes,asmalign_pot=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm (".align 3"); ]], [[]])],[asmalign_pot=yes],[asmalign_pot=no]) if test x"$asmalign_pot" == xyes; then asmalign_out=`echo \".align\" '#ZEROBITS' \"\\\n\\\t\"` @@ -1506,16 +1504,15 @@ dnl ------------------------------------ dnl Checks for XviD headers AC_MSG_CHECKING(for XviD header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <xvid.h> - ], - [ + ]], [[ #ifdef XVID_API xvid_gbl_init_t xinit; #else XVID_INIT_PARAM *xinit; #endif - ], xvid_header_ok=yes, xvid_header_ok=no) + ]])],[xvid_header_ok=yes],[xvid_header_ok=no]) AC_MSG_RESULT($xvid_header_ok) if test x"$xvid_header_ok" = xno; then @@ -1527,7 +1524,7 @@ dnl ------------------------------------ dnl Checks for XviD API version AC_MSG_CHECKING(if XviD API version is 2.1 or 4.0 or 4.1) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <xvid.h> int main() { #ifdef API_VERSION @@ -1537,7 +1534,7 @@ dnl Checks for XviD API version return 1; #endif #elif defined(XVID_API) - #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) + #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) || XVID_API == XVID_MAKE_API(4, 2) return 0; #else return 1; @@ -1545,13 +1542,11 @@ dnl Checks for XviD API version #else return 1; #endif } - ], - [ + ]])],[ xvid_api_version="yes" - ], - [ + ],[ xvid_api_version="no" - ]) + ],[]) AC_MSG_RESULT($xvid_api_version) if test "$xvid_api_version" = "no"; then @@ -1583,14 +1578,13 @@ dnl Checks for ogg / vorbis / theora hea if test "$enable_ogg" != "no"; then AC_MSG_CHECKING(for ogg-vorbis-theora header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <theora/theora.h> #include <vorbis/codec.h> #include <vorbis/vorbisenc.h> - ], - [ - ], ogg_header_ok=yes, ogg_header_ok=no) + ]], [[ + ]])],[ogg_header_ok=yes],[ogg_header_ok=no]) AC_MSG_RESULT($ogg_header_ok) if test x"$ogg_header_ok" = xno; then @@ -1667,10 +1661,9 @@ dnl Checks for divx4linux headers if test "$enable_divx4linux" != "no"; then AC_MSG_CHECKING(for divx4linux header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <encore2.h> - ], - [ + ]], [[ #if ENCORE_VERSION >= 20021024 DivXBitmapInfoHeader infos; SETTINGS param; @@ -1679,7 +1672,7 @@ if test "$enable_divx4linux" != "no"; th #endif ENC_FRAME fr; ENC_RESULT res; - ], divx_header_ok=yes, divx_header_ok=no) + ]])],[divx_header_ok=yes],[divx_header_ok=no]) AC_MSG_RESULT($divx_header_ok) if test x"$divx_header_ok" = xno; then @@ -1709,12 +1702,11 @@ dnl ------------------------------------ dnl Checks for lame headers AC_MSG_CHECKING(for lame header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lame/lame.h> - ], - [ + ]], [[ lame_global_flags *gfp; - ], lame_header_ok=yes, lame_header_ok=no) + ]])],[lame_header_ok=yes],[lame_header_ok=no]) AC_MSG_RESULT($lame_header_ok) if test x"$lame_header_ok" = xno; then @@ -1793,7 +1785,7 @@ fi if test "$enable_zvbi" != "no"; then AC_MSG_CHECKING(for zvbi header files) - AC_TRY_COMPILE([#include <libzvbi.h>],,zvbi_h_ok=yes,zvbi_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libzvbi.h>]], [[]])],[zvbi_h_ok=yes],[zvbi_h_ok=no]) AC_MSG_RESULT($zvbi_h_ok) if test "$zvbi_h_ok" = "yes"; then CFLAGS_sau="$CFLAGS" @@ -1817,12 +1809,11 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_faac" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for faac header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdlib.h> #include <faac.h> - ], - [ - ],faac_h_ok=yes,faac_h_ok=no) + ]], [[ + ]])],[faac_h_ok=yes],[faac_h_ok=no]) AC_MSG_RESULT($faac_h_ok) if test "$faac_h_ok" == yes; then @@ -1844,14 +1835,13 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_x264" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for x264 header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> #include <inttypes.h> #include <x264.h> - ], - [ + ]], [[ x264_t* try; - ], x264_h_ok=yes, x264_h_ok=no) + ]])],[x264_h_ok=yes],[x264_h_ok=no]) AC_MSG_RESULT($x264_h_ok) if test "$x264_h_ok" == "yes"; then @@ -1875,21 +1865,20 @@ if test "x$with_external_ffmpeg" != "xye dnl ^^ NO NO!! the kernel headers used to compile MUST be the same than dnl the ones which have been used to compile the current glibc !!! dnl see http://lkml.org/lkml/2000/7/27/10 - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <linux/dvb/frontend.h> - ],,dvb_drivers_ok=yes,dvb_drivers_ok=no) + ]], [[]])],[dvb_drivers_ok=yes],[dvb_drivers_ok=no]) AC_MSG_RESULT($dvb_drivers_ok) dnl check for LIBSDL headers AC_MSG_CHECKING(for libsdl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <SDL/SDL.h> #include <SDL/SDL_thread.h> - ], - [ + ]], [[ SDL_mutex *mutex; SDL_cond *cond; - ], libsdl_header_ok=yes, libsdl_header_ok=no) + ]])],[libsdl_header_ok=yes],[libsdl_header_ok=no]) AC_MSG_RESULT($libsdl_header_ok) if test "$libsdl_header_ok" != "no"; then @@ -1906,13 +1895,12 @@ if test "x$with_external_ffmpeg" != "xye dnl check for LIBCURL headers AC_MSG_CHECKING(for libcurl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <curl/curl.h> - ], - [ + ]], [[ CURL *curl; CURLcode res; - ], libcurl_header_ok=yes, libcurl_header_ok=no) + ]])],[libcurl_header_ok=yes],[libcurl_header_ok=no]) AC_MSG_RESULT($libcurl_header_ok) if test "$libcurl_header_ok" != "no"; then @@ -1944,7 +1932,7 @@ dnl ------------------------------------ dnl Check for DBUS DBUS_REQS_MIN=0.35 -AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Use DBUS support]),, with_dbus=auto) +AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[Use DBUS support]),, with_dbus=auto) if test "x$with_dbus" != "xno"; then PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS_MIN, enable_dbus=yes, enable_dbus=no) @@ -2230,13 +2218,10 @@ dnl FFmpeg inside dnl --------------------------------------------------------------- AC_MSG_CHECKING([for socklen_t]) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> - #include <sys/socket.h>], - [socklen_t x;], - [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in], - [AC_MSG_RESULT([no]) ] - ) + #include <sys/socket.h>]], [[socklen_t x;]])],[AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in],[AC_MSG_RESULT([no]) + ]) LIBS="$saved_LIBS" @@ -3398,4 +3383,5 @@ fi dnl --------------------------------------------------------------------- dnl Writing results -AC_OUTPUT(config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile) +AC_CONFIG_FILES([config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile]) +AC_OUTPUT diff -up xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 xdtv-2.4.1cvs15/src/grab-v4l2.c --- xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 2009-04-08 16:16:12.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-v4l2.c 2009-04-08 16:16:12.000000000 +0200 @@ -48,6 +48,18 @@ #include "colorspace.h" #include "memcpy.h" #include "blackborder.h" + +#ifdef HAVE_LIBV4L2 || 1 +# include <libv4l2.h> +#else +# define v4l2_fd_open(fd, flags) (fd) +# define v4l2_open open +# define v4l2_close close +# define v4l2_ioctl ioctl +# define v4l2_mmap mmap +# define v4l2_munmap munmap +#endif + extern int x11_bigendian; static int fmts_xaw_to_v4l2[MAX_VIDEO_FMT] = { @@ -171,14 +183,14 @@ static int grab_open(struct device_t *de if (debug) fprintf (stderr, "v4l2: open\n"); - if (-1 == (bttvfd = open (device->video ? device->video : "/dev/video", O_RDWR))) + if (-1 == (bttvfd = v4l2_open (device->video ? device->video : "/dev/video", O_RDWR))) { - fprintf (stderr, "open %s: %s\n", + fprintf (stderr, "v4l2_open %s: %s\n", device->video ? device->video : "/dev/video", strerror (errno)); goto err; } - if (-1 == ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) { fprintf (stderr, "driver is not v4l2\n"); goto err; @@ -217,7 +229,7 @@ static int grab_open(struct device_t *de for (drv.nfmts = 0; drv.nfmts < MAX_FORMAT; drv.nfmts++) { drv.fmt[drv.nfmts].index = drv.nfmts; drv.fmt[drv.nfmts].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (-1 == ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) break; } @@ -225,22 +237,22 @@ static int grab_open(struct device_t *de ioctl(bttvfd,VIDIOC_G_PARM,&drv.streamparm); drv.brightness.id = V4L2_CID_BRIGHTNESS; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) drv.brightness.id = 0; drv.contrast.id = V4L2_CID_CONTRAST; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) drv.contrast.id = 0; drv.hue.id = V4L2_CID_HUE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) drv.hue.id = 0; drv.saturation.id = V4L2_CID_SATURATION; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) drv.saturation.id = 0; drv.mute.id = V4L2_CID_AUDIO_MUTE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) drv.mute.id = 0; drv.volume.id = V4L2_CID_AUDIO_VOLUME; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || drv.volume.minimum==drv.volume.maximum) drv.volume.id = 0; //exit(0); @@ -272,8 +284,8 @@ static int grab_open(struct device_t *de } /* frame buffer */ - if (-1 == ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { - perror ("ioctl VIDIOC_G_FBUF"); + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { + perror ("v4l2_ioctl VIDIOC_G_FBUF"); fprintf(stderr, "classical overlay is disabled"); ov_error=1; } else { @@ -303,19 +315,19 @@ static int grab_open(struct device_t *de gbformat.fmt.pix.pixelformat = drv.fmt[0].pixelformat; gbformat.fmt.pix.width = 768; gbformat.fmt.pix.height = 576; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) + perror("v4l2_ioctl VIDIOC_S_FMT"); gbformat.fmt.pix.pixelformat = -1; // to force changeformat... return 0; err: if (bttvfd != -1) { - close (bttvfd); + v4l2_close (bttvfd); bttvfd = -1; } if (vbifd != -1) { - close (vbifd); + v4l2_close (vbifd); vbifd = -1; } if(gb2!=NULL) free(gb2); @@ -331,9 +343,9 @@ grab_close () return 0; grab_audio (1, -1, NULL); if(grab) stop_capture(); - close(bttvfd); + v4l2_close(bttvfd); bttvfd = -1; - close(vbifd); + v4l2_close(vbifd); vbifd = -1; free(grab_v4l2.norms); grab_v4l2.norms = NULL; free(grab_v4l2.inputs); grab_v4l2.inputs = NULL; @@ -355,8 +367,8 @@ grab_overlay (int x, int y, int width, i { if (debug) fprintf (stderr, "v4l2: overlay off\n"); - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) + perror("v4l2_ioctl VIDIOC_OVERLAY"); overlay = 0; changeformat(&gbformat); return 0; @@ -385,14 +397,14 @@ grab_overlay (int x, int y, int width, i } } - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &win)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &win)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) { - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { + perror("v4l2_ioctl VIDIOC_OVERLAY"); return -1; } overlay = 1; @@ -409,12 +421,12 @@ grab_queue (struct v4l2_buffer *gb) fprintf (stderr, "g%d", gb->index); if(overlay) {fprintf(stderr,"BIG PB\n");exit(1);} - if (-1 == ioctl (bttvfd, VIDIOC_QBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_QBUF, gb)) { if (errno == EAGAIN) fprintf (stderr, "grabber chip can't sync (no station tuned in?)\n"); else - fprintf (stderr, "ioctl VIDIOC_QBUF(%d): %s\n", + fprintf (stderr, "v4l2_ioctl VIDIOC_QBUF(%d): %s\n", gb->index, strerror (errno)); return -1; } @@ -452,9 +464,9 @@ grab_wait (struct v4l2_buffer *gb) return -1; } - if (-1 == ioctl (bttvfd, VIDIOC_DQBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_DQBUF, gb)) { - perror ("ioctl VIDIOC_DQBUF"); + perror ("v4l2_ioctl VIDIOC_DQBUF"); return -1; } @@ -517,12 +529,12 @@ static int stop_capture(void) { while (gb_grab!=gb_sync) if(grab_wait(&gb2[imgw])<0) {reset(); break;} type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { - perror("ioctl VIDIOC_STREAMOFF"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMOFF"); return -1; } for(i = 0; i < nbufs; i++) - if(maps[i]!=NULL) munmap(maps[i],gb2[i].length); + if(maps[i]!=NULL) v4l2_munmap(maps[i],gb2[i].length); free(maps);free(gb2); maps=NULL; gb2=NULL; grab = 0; @@ -536,8 +548,8 @@ static int start_capture(void) { reqbufs.count = nbufs_default; reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; reqbufs.memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { - perror("ioctl VIDIOC_REQBUFS"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { + perror("v4l2_ioctl VIDIOC_REQBUFS"); return -1; } nbufs = reqbufs.count; @@ -550,22 +562,22 @@ static int start_capture(void) { gb2[i].index = i; gb2[i].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; gb2[i].memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { - perror("ioctl VIDIOC_QUERYBUF"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { + perror("v4l2_ioctl VIDIOC_QUERYBUF"); return -1; } - maps[i] = mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, + maps[i] = v4l2_mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, bttvfd, gb2[i].m.offset); if(maps[i] == MAP_FAILED) { - perror("mmap"); + perror("v4l2_mmap"); return -1; } } type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMON,&type)) { - perror("ioctl VIDIOC_STREAMON"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMON,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMON"); return -1; } grab = 1; @@ -587,8 +599,8 @@ static int changeformat(struct v4l2_form if(fmt->fmt.pix.pixelformat==-1) return -1; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) @@ -643,7 +655,7 @@ grab_tune (const struct CHANNEL* chan) memset(&f,0,sizeof(f)); f.type = V4L2_TUNER_ANALOG_TV; f.frequency = chan->freq; - if(ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) + if(v4l2_ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) perror("VIDIOC_S_FREQUENCY"); return 0; } @@ -654,7 +666,7 @@ grab_tuned () struct v4l2_tuner tuner; memset(&tuner,0,sizeof(tuner)); - if (-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) return 0; return tuner.signal ? 1 : 0; } @@ -666,8 +678,8 @@ grab_input (int input, int norm) if (-1 != input) { if (debug) fprintf (stderr, "v4l2: input: %d\n", input); - if( -1 == ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) - perror("ioctl VIDIOC_S_INPUT"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) + perror("v4l2_ioctl VIDIOC_S_INPUT"); } if (-1 != norm) { @@ -677,8 +689,8 @@ grab_input (int input, int norm) int overlay2 = overlay; if(overlay2) video_overlay (NULL); if(grab) stop_capture(); - if( -1 == ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { - perror("ioctl VIDIOC_S_STD"); + if( -1 == v4l2_ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { + perror("v4l2_ioctl VIDIOC_S_STD"); return -1; } if(overlay2) @@ -701,8 +713,8 @@ static inline int control(int x,struct v if(ctrl->id == 0) return -1; c.id = ctrl->id; c.value = (float)x/65535*(ctrl->maximum-ctrl->minimum)+ctrl->minimum+0.5; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { - perror("ioctl VIDIOC_S_CTRL"); + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { + perror("v4l2_ioctl VIDIOC_S_CTRL"); return -1; } return 0; @@ -726,18 +738,18 @@ grab_audio (int mute, int volume, int *m if(mute !=-1 && drv.mute.id) { c.id = V4L2_CID_AUDIO_MUTE; c.value = mute; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE"); } if(volume !=-1 && drv.volume.id) { c.id = V4L2_CID_AUDIO_VOLUME; c.value = volume; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_VOLUME"); } if(mode) { memset(&tuner,0,sizeof(tuner)); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); if(*mode) { switch(*mode) { @@ -746,9 +758,9 @@ grab_audio (int mute, int volume, int *m case 3: tuner.audmode = V4L2_TUNER_MODE_LANG1; break; case 4: tuner.audmode = V4L2_TUNER_MODE_LANG2; break; } - if(-1 == ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) perror("VIDIOC_S_TUNER"); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); } switch(tuner.audmode) { diff -up xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 xdtv-2.4.1cvs15/src/Makefile.am --- xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 2009-04-08 16:16:11.000000000 +0200 +++ xdtv-2.4.1cvs15/src/Makefile.am 2009-04-08 16:21:29.000000000 +0200 @@ -154,7 +154,7 @@ AM_CFLAGS = @CFLAGPTHREAD@ @DEBUG@ -Wall INCLUDES = -I../alevt -Idvb @FFMPEGINC@ @DBUS_CFLAGS@ -xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ +xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ @LIBV4L2_LIBS@ xdtv_LDFLAGS = -rdynamic @@ -168,7 +168,7 @@ xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @L install-exec-local: install-binPROGRAMS chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf -xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ +xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ @LIBV4L2_LIBS@ xdtv_scantv_SOURCES = xdtv_scantv.c grab-v4l.c grab-v4l2.c strtab.c colorspace.c frequencies.c translation.c xdtv-2.4.1cvs15-noldffmpeg.patch: --- NEW FILE xdtv-2.4.1cvs15-noldffmpeg.patch --- diff -up xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg xdtv-2.4.1cvs15/src/container-ffmpeg.c --- xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg 2009-04-06 21:22:44.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container-ffmpeg.c 2009-04-06 21:25:15.000000000 +0200 @@ -23,16 +23,8 @@ #ifdef HAVE_FFMPEG #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif static AVOutputFormat *av_output_fmt = NULL; static AVFormatContext *oc=NULL; diff -up xdtv-2.4.1cvs15/src/container.h.noldffmpeg xdtv-2.4.1cvs15/src/container.h --- xdtv-2.4.1cvs15/src/container.h.noldffmpeg 2009-04-06 21:20:21.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container.h 2009-04-06 21:20:30.000000000 +0200 @@ -14,11 +14,7 @@ #include "strtab.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #endif enum { diff -up xdtv-2.4.1cvs15/src/divx.h.noldffmpeg xdtv-2.4.1cvs15/src/divx.h --- xdtv-2.4.1cvs15/src/divx.h.noldffmpeg 2009-04-06 21:21:07.000000000 +0200 +++ xdtv-2.4.1cvs15/src/divx.h 2009-04-06 21:21:28.000000000 +0200 @@ -31,17 +31,9 @@ #include "container.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif #endif #endif diff -up xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg xdtv-2.4.1cvs15/src/grab-dvb.c --- xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg 2009-04-06 21:25:47.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-dvb.c 2009-04-06 21:27:11.000000000 +0200 @@ -44,29 +44,12 @@ #include "dvbtools.h" #include "avilib.h" -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> # include <libavcodec/audioconvert.h> -#else -# include "avcodec.h" -# include "audioconvert.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H # include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif -#if HAVE_LIBAVUTIL_COMMON_H # include <libavutil/common.h> -#else -# include "common.h" -#endif #ifdef HAVE_SWSCALE -#if HAVE_LIBSWSCALE_SWSCALE_H # include <libswscale/swscale.h> -#else -# include "swscale.h" -#endif #endif /* because this part of code was moved from mem.h to internal.h */ --- NEW FILE xdtv.desktop --- [Desktop Entry] Name=XdTV Comment=Capture View & Broadcast Video4Linux Streams Comment[fr]=Capturer Visualiser & Diffuser des flux v4l Exec=xdtv Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; --- NEW FILE xdtv.spec --- %define cvs cvs15 Name: xdtv Version: 2.4.1 Release: 0.5%{?cvs}%{?dist} Summary: Video4Linux Stream Capture Viewer & Recorder Group: Applications/Multimedia License: GPLv2+ URL: http://xawdecode.sourceforge.net/ Source0: http://downloads.sourceforge.net/xawdecode/xdtv-%{version}%{?cvs}.tar.gz Source1: xdtv_v4l-conf.pam Source2: xdtv.desktop Source3: xdtv_wizard.desktop Patch0: xdtv-2.4.1cvs15-noldffmpeg.patch Patch1: xdtv-2.4.1cvs15-libv4l2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-server-utils BuildRequires: yasm xterm BuildRequires: libtool automake17 BuildRequires: a52dec-devel BuildRequires: faac-devel BuildRequires: ffmpeg-devel BuildRequires: lame-devel BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: lirc-devel BuildRequires: libpng-devel BuildRequires: libv4l-devel BuildRequires: libvorbis-devel BuildRequires: xvidcore-devel BuildRequires: zvbi-devel BuildRequires: alsa-lib-devel BuildRequires: neXtaw-devel BuildRequires: SDL-devel BuildRequires: curl-devel BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXpm-devel BuildRequires: libXinerama-devel BuildRequires: libXv-devel #Needed for consolehelper Requires: usermode %description XdTV is a software that allows you to to record & watch TV. It interacts with AleVT for Teletext and Nxtvepg for NextView, and uses the video4linux API. It can use some deinterlacing filters and can record video files in various containers (AVI, MPEG, OGG, etc.) with many codecs (FFMpeg(>=0.4.6), XviD(0.9 & 1.x), Ogg Theora (>=1.0alpha5) & Vorbis and DivX4/5). It has also some plugin capabilities. %package devel Summary: Developpement files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: neXtaw-devel Requires: libXt-devel %description devel Developpement files for %{name} %package OSD-font Summary: Font used by %{name} OSD function Group: User Interface/X Requires: %{name} = %{version}-%{release} %description OSD-font Font used by %{name} OSD function. # ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?cvs} # fix flags sed -i -e 's|PERF_FLAGS=|#PERF_FLAGS=|' src/Makefile.am src/Makefile.in # Fix plugdir for lib64 sed -i -e 's|lib/xdtv-plugins|%{_lib}/xdtv-plugins|' src/plugin.c # Convert not UTF-8 files mkdir -p __temp for f in README.ffmpeg README.lirc README.xvid FAQfr-xdtv ;do cp -p $f __temp/$f iconv -f ISO-8859-1 -t UTF-8 __temp/$f > $f touch -r __temp/$f $f done rm -rf __temp #Fix for alevtparams_ui.c sed -i.neXtaw -e 's|X11/Xaw|X11/neXtaw|g' src/*.{c,h} src/devicemanager/devicemanager_ui.c #Patching to remove doubfully support for oldish ffmpeg %patch0 -p1 -b .noldffmpeg %patch1 -p1 -b .libv4l2 #Prevent internal ffmpeg to be used. rm -rf libav* libpostproc libswscale #hack xvidAPI - added in patch1 #sed -i.xvid42 -e 's/4, 0/4, 2/' configure.in configure autoreconf -vif # ----------------------------------------------------------------------------- %build export CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" export CPPFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" %configure --disable-divx4linux \ --enable-arch-detection \ --enable-cpu-options \ --disable-static \ --with-fontdir=%{_datadir}/X11/fonts/misc --enable-smallfont \ --enable-pixmaps \ --with-external-ffmpeg \ --with-dbus make %{?_smp_mflags} # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p " install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' # Make xdtv owns the plugin dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv-plugins # Make xdtv owns the locales dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv # remove the setuid root of this file (need to be root to use it) chmod 0755 $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # xdtv_v4l-conf stuff - inspired from xawtv mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdtv_v4l-conf cat >xdtv_v4l-conf.apps <<! SESSION=true USER=root PROGRAM=%{_sbindir}/xdtv_v4l-conf ! install -m 0644 xdtv_v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xdtv_v4l-conf mv $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # Deprecated rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.dir rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.scale #Icons for i in 16 32 48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps install -pm 0644 %{name}-${i}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done #Desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE2} desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE3} # ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %{_bindir}/update-desktop-database %{_datadir}/applications || : %postun %{_bindir}/update-desktop-database %{_datadir}/applications touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : %post OSD-font if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi %postun OSD-font if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING INSTALL FAQfr-xdtv TODO %doc README README.dvb README.record README.bs README.ffmpeg README.streaming %doc README.bsd README.gentoo README.xvid README.buildme README.lirc %doc README.deinterlace README.plugins ChangeLog lisez-moi xdtvrc.sample %doc lircrc.miro.sample lircrc.hauppauge.sample lircrc.animax.sample %doc lircrc.WinfastTV2000.sample %{_sbindir}/xdtv_v4l-conf %{_bindir}/xdtv* %{_datadir}/X11/app-defaults/XdTV %config %{_sysconfdir}/pam.d/xdtv_v4l-conf %config %{_sysconfdir}/security/console.apps/xdtv_v4l-conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en.conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en-UTF8.conf %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/xdtv/ %{_datadir}/applications/*xdtv.desktop %{_datadir}/applications/*xdtv_wizard.desktop %{_mandir}/man1/*.1.gz # Directory for plugins %dir %{_libdir}/xdtv-plugins # Directory for locales %dir %{_libdir}/xdtv %files devel %defattr(-,root,root,-) %{_includedir}/%{name}/ %files OSD-font %defattr(-,root,root,-) %{_datadir}/X11/fonts/misc/*.pcf.gz %changelog * Wed Apr 8 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.5cvs15 - Add libv4l2 support - Fix xvidcore API 4.2 - Remove hardcoded PERF_FLAGS - Add desktop files in SOURCE * Mon Apr 6 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.4cvs15 - Update to 2.4.1cvs15 * Mon Jan 5 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.3cvs14 - Update to 2.4.1cvs14 * Mon Oct 14 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.2cvs13 - Add PAM support - picked from xawtv (instead of having xdtv_v4l-conf to be setuid root) - Re-order configure options - Only use neXtaw instead of Xaw * Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs13 - Update to 2.4.1cvs13 * Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs12 - Update to 2.4.1cvs12 * Tue Mar 25 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs8 - Update to 2.4.1cvs8 * Sat Jan 12 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs5 - Update to 2.4.1cvs5 * Thu Dec 6 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs4 - Update to 2.4.1cvs4 * Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs3 - Update to 2.4.1cvs3 * Thu Oct 25 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs2 - Update to pre 2.4.1 cvs2 - Fix the plugin directory on lib64 - Remove info post postun * Mon Feb 27 2007 kwizart < kwizart at gmail.com > - 2.4.0-1 - Update to final 2.4.0 - remove desktop file vendor and add category * Mon Feb 05 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.10.pre0 - Fix compile flags * Wed Jan 3 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.9.pre0 - ffmpeg-rebuild - some patches from gentoo - conform to versioning guidelines - tweak some includes in divx.h - Enabled Optimization * Sun Dec 17 2006 kwizart < kwizart at gmail.com > 2.4.0pre0-8.kwizart.fc6 - Try to use ffmpeg-amr-devel with static lib with xdtv * Sun Dec 10 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-7.kwizart.fc6 - Cleaned spec file. * Sat Nov 11 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-6.kwizart.fc6 - libdir in configure. - cleaned spec file for livna.org. - Now use updated ffmpeg tarball from livna 20061030 src.rpm. - Re-use x264 from livna. * Wed Nov 06 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-5.kwizart.fc6 - New release for fc6 * Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-4.kwizart.FC5 - dropped x264 - recent x264 version won't build with xdtv - man files are in correct place. * Sat Sep 22 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-3.kwizart.FC5 - amr support (amrnb_float amrwb_float). * Sun Sep 16 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-2.kwizart.FC5 - Cleaned $RPM_BUILD_ROOT tags / - Problem with application cache / fixed? * Fri Aug 04 2006 kwizart < kwizart at gmail.com > - switch to livna release * Sat Mar 25 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc5 - 2.3.2 on FC5 - The system app-defaults/ directory for X resources is now /usr/share/X11/app-defaults/ on Fedora Core 5 and for future Red Hat Enterprise Linux systems. - FC5 has modular X. All the libraries that were in xorg-x11-devel now have their own packages and you need to include the -devel packages for the libraries your project is actually using. - all infos here: http://fedora.redhat.com/docs/release-notes/fc5/ - new paths for desktop icons & TV misc fonts & font utils * Sun Mar 19 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc4 - 2.3.2 - fix error with the instalation of the TV fonts (need chkfontpath). - fix error with the path of the ressource file (not the same path than in a Mandriva distro). - fix error with the menu update (the menu was not updated). - fix error with the path of the man files (return back to the old method). * Fri Feb 24 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.1-1fc4 - 2.3.1 - FFmpeg inside XdTV - Add the possibility to compile with amr_nb & amr_wb * Fri Dec 23 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.3.0-1 - 2.3.0 - Compiled with --disable-divx4linux & neXtaw - Spec file updated * Sun Jul 03 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-2 - add the xdtv_wizard menu entry * Fri Jul 01 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-1 - Upgrade to 2.2.0 - Compiled with --disable-divx4linux - Spec file cleanup * Sun Apr 03 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.1.1-1 - Upgrade to 2.1.1 * Sun Jan 02 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.0.1-1 - Upgrade to 2.0.1 - Obsolete xawdecode - Clean up installation instructions * Fri Nov 28 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.2-1 - Upgrade to 1.8.2 * Sat Oct 04 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.1-1 - Upgrade to 1.8.1 * Tue Sep 02 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.0-1 - Initial RPM release. --- NEW FILE xdtv_v4l-conf.pam --- #%PAM-1.0 auth sufficient pam_rootok.so auth required pam_console.so account required pam_permit.so session required pam_permit.so session optional pam_xauth.so --- NEW FILE xdtv_wizard.desktop --- [Desktop Entry] Name=XdTV Wizard Comment=XdTV Wizard Exec=xdtv_wizard Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xdtv/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2009 11:10:52 -0000 1.1 +++ .cvsignore 13 May 2009 12:05:07 -0000 1.2 @@ -0,0 +1 @@ +xdtv-2.4.1cvs15.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/xdtv/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2009 11:10:52 -0000 1.1 +++ sources 13 May 2009 12:05:07 -0000 1.2 @@ -0,0 +1 @@ +890a6c98c904326be88d163cdf602018 xdtv-2.4.1cvs15.tar.gz

15 years, 6 months

1
0
0 / 0

rpms/xdtv/devel xdtv-2.4.1cvs15-libv4l2.patch, NONE, 1.1 xdtv-2.4.1cvs15-noldffmpeg.patch, NONE, 1.1 xdtv.desktop, NONE, 1.1 xdtv.spec, NONE, 1.1 xdtv_v4l-conf.pam, NONE, 1.1 xdtv_wizard.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xdtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28638/devel Modified Files: .cvsignore sources Added Files: xdtv-2.4.1cvs15-libv4l2.patch xdtv-2.4.1cvs15-noldffmpeg.patch xdtv.desktop xdtv.spec xdtv_v4l-conf.pam xdtv_wizard.desktop Log Message: Initial import for Rawhide xdtv-2.4.1cvs15-libv4l2.patch: --- NEW FILE xdtv-2.4.1cvs15-libv4l2.patch --- diff -up xdtv-2.4.1cvs15/configure.in.libv4l2 xdtv-2.4.1cvs15/configure.in --- xdtv-2.4.1cvs15/configure.in.libv4l2 2009-03-21 12:53:15.000000000 +0100 +++ xdtv-2.4.1cvs15/configure.in 2009-04-08 16:16:13.000000000 +0200 @@ -4,8 +4,9 @@ dnl ------------------------------------ dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------- -AC_INIT(src/main.c) -AC_PREREQ(2.5) +AC_INIT +AC_CONFIG_SRCDIR([src/main.c]) +AC_PREREQ(2.63) XDTV_MAJOR=2 XDTV_MINOR=4 @@ -19,7 +20,7 @@ AC_SUBST(SPEC_VERSION) PKG_PROG_PKG_CONFIG AM_INIT_AUTOMAKE("xdtv", $XDTV_MAJOR.$XDTV_MINOR.$XDTV_SUB) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) dnl --------------------------------------------------------------------- @@ -191,7 +192,14 @@ AC_C_CONST AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T -AC_STRUCT_ST_RDEV +AC_DIAGNOSE([obsolete],[your code should no longer depend upon `HAVE_ST_RDEV', but +`HAVE_STRUCT_STAT_ST_RDEV'. Remove this warning and +the `AC_DEFINE' when you adjust the code.])dnl +AC_CHECK_MEMBERS([struct stat.st_rdev],[AC_DEFINE(HAVE_ST_RDEV, 1, + [Define to 1 if your `struct stat' has `st_rdev'. + Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' + instead.])]) + AC_HEADER_TIME @@ -213,7 +221,7 @@ if test x$YASM_PROG = xyes; then AC_MSG_CHECKING(for yasm compilation) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ],,YASM_PROG=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsw %xmm0, %xmm0") ]])],[],[YASM_PROG=no]) AC_MSG_RESULT($YASM_PROG) CFLAGS="$CFLAGS_sau" fi @@ -346,54 +354,54 @@ if test "x$host_arch" = "xi386" || test #mmx assembler non-compilable -> no assembler AC_MSG_CHECKING(for MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms":::"memory") ],, enable_mmx=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("emms") ],, enable_mmx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms":::"memory") ]])],[],[enable_mmx=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("emms") ]])],[],[enable_mmx=no]) AC_MSG_RESULT($enable_mmx) #mmxext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended MMX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence":::"memory") ],, enable_mmxext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("sfence") ],,enable_mmxext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence":::"memory") ]])],[],[enable_mmxext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("sfence") ]])],[],[enable_mmxext=no]) AC_MSG_RESULT($enable_mmxext) #3dnow assembler non-compilable -> no assembler AC_MSG_CHECKING(for 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms":::"memory") ],,enable_3dnow=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("femms") ],,enable_3dnow=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms":::"memory") ]])],[],[enable_3dnow=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("femms") ]])],[],[enable_3dnow=no]) AC_MSG_RESULT($enable_3dnow) #3dnowext assembler non-compilable -> no assembler AC_MSG_CHECKING(for Extended 3DNOW support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ],,enable_3dnowext=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ],,enable_3dnowext=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %%mm0, %%mm0":::"memory") ]])],[],[enable_3dnowext=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pswapd %mm0, %mm0") ]])],[],[enable_3dnowext=no]) AC_MSG_RESULT($enable_3dnowext) #sse assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ],,enable_sse=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ],,enable_sse=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorps %xmm0, %xmm0") ]])],[],[enable_sse=no]) AC_MSG_RESULT($enable_sse) #sse2 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE2 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ],,enable_sse2=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ],,enable_sse2=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse2=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorpd %xmm0, %xmm0") ]])],[],[enable_sse2=no]) AC_MSG_RESULT($enable_sse2) #sse3 assembler non-compilable -> no assembler AC_MSG_CHECKING(for SSE3 support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ],,enable_sse3=no) - dnl AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ],,enable_sse3=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %%xmm0, %%xmm0":::"memory") ]])],[],[enable_sse3=no]) + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pabsd %xmm0, %xmm0") ]])],[],[enable_sse3=no]) AC_MSG_RESULT($enable_sse3) #ebp assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBP support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ],,enable_ebp=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("xorl %ebp, %ebp"::: "%ebp") ]])],[],[enable_ebp=no]) AC_MSG_RESULT($enable_ebp) #ebx assembler non-compilable -> no assembler AC_MSG_CHECKING(for EBX support with an ASM test) - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("":::"%ebx") ],,enable_ebx=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("":::"%ebx") ]])],[],[enable_ebx=no]) AC_MSG_RESULT($enable_ebx) fi @@ -406,7 +414,7 @@ if test "x$host_arch" = "xsparc" || test AC_MSG_CHECKING(for SPARC vis support with an ASM test) CFLAGS_sau="$CFLAGS" CFLAGS="$CFLAGS -mcpu=ultrasparc -mtune=ultrasparc" - AC_TRY_COMPILE(,[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ],,enable_vis=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ __asm__ __volatile__ ("pdist %f0, %f0, %f0") ]])],[],[enable_vis=no]) CFLAGS="$CFLAGS_sau" AC_MSG_RESULT($enable_vis) @@ -712,19 +720,25 @@ dnl video drivers detection case $host_syst in linux) AC_MSG_CHECKING(for video4linux) - AC_TRY_COMPILE([#include <sys/types.h> - #include <linux/videodev.h>],,v4l_ok=yes,v4l_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> + #include <linux/videodev.h>]], [[]])],[v4l_ok=yes],[v4l_ok=no]) if test "x$v4l_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_1,,have video4linux) fi AC_MSG_RESULT($v4l_ok) AC_MSG_CHECKING(for video4linux version 2) - AC_TRY_COMPILE([#include <sys/types.h> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <linux/videodev.h> - #include <linux/videodev2.h>],,v4l2_ok=yes,v4l2_ok=no) + #include <linux/videodev2.h>]], [[]])],[v4l2_ok=yes],[v4l2_ok=no]) if test "x$v4l2_ok" = "xyes"; then AC_DEFINE(HAVE_V4L_2,,have video4linux version 2) + PKG_CHECK_MODULES([LIBV4L2], [libv4l2] , [ + have_libv4l2=yes + AC_DEFINE(HAVE_LIBV4L2,,have video4linux version 2) + ], [ + have_libv4l2=no + ]) fi AC_MSG_RESULT($v4l2_ok) @@ -976,7 +990,7 @@ dnl ------------------------------------ dnl Possibility to link against an external ffmpeg dnl rather than the included one -AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [Use external ffmpeg library])) +AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg],[Use external ffmpeg library])) dnl --------------------------------------------------------------------- dnl Checks for Xpm libraries. @@ -1060,7 +1074,7 @@ AC_SUBST(LIBLIRC) LIBLIRC="" if test "$enable_lirc" != "no"; then AC_MSG_CHECKING(for lirc header files) - AC_TRY_COMPILE([#include <lirc/lirc_client.h>],,lirc_h_ok=yes,lirc_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lirc/lirc_client.h>]], [[]])],[lirc_h_ok=yes],[lirc_h_ok=no]) AC_MSG_RESULT($lirc_h_ok) if test "$lirc_h_ok" = "yes"; then AC_CHECK_LIB(lirc_client, lirc_init, @@ -1087,27 +1101,27 @@ if test "$host_syst" = linux -a "$enable asoundlib="none" AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with alsa/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <alsa/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H,, Alsa headers are in alsa) asoundlib="alsa" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) if test "$asoundlib" != "alsa"; then AC_MSG_CHECKING(for alsa 0.9.x or 1.0.x with sys/asoundlib.h) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <sys/asoundlib.h> int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); } - ],[ + ]])],[ AC_DEFINE(HAVE_ALSA,, Alsa sound library (only 0.9.x and 1.0.x are supported)) AC_DEFINE(HAVE_SYS_ASOUNDLIB_H,, Alsa headers are in sys) asoundlib="sys" AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) + ],[AC_MSG_RESULT(no)],[]) fi if test "$asoundlib" = "none"; then @@ -1268,13 +1282,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavcodec (ffmpeg) headers AC_MSG_CHECKING(for libavcodec (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avcodec.h> - ], - [ + ]], [[ AVCodec *codec; AVCodecContext codec_context; - ], libavcodec_header_ok=yes, libavcodec_header_ok=no) + ]])],[libavcodec_header_ok=yes],[libavcodec_header_ok=no]) AC_MSG_RESULT($libavcodec_header_ok) if test x"$libavcodec_header_ok" = xno; then echo "*** Could not find libavcodec (ffmpeg) header files ***" @@ -1284,12 +1297,12 @@ if test "x$enable_ffmpeg" != "xno"; then dnl Checks for libavformat (ffmpeg) headers AC_MSG_CHECKING(for libavformat (ffmpeg) header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <ffmpeg/avformat.h> #if LIBAVFORMAT_BUILD <= 4608 #error "libavformat too old" #endif - ],, libavformat_header_ok=yes, libavformat_header_ok=no) + ]], [[]])],[libavformat_header_ok=yes],[libavformat_header_ok=no]) AC_MSG_RESULT($libavformat_header_ok) if test "x$libavformat_header_ok" = "xno"; then echo "*** Could not find libavformat (ffmpeg) header files ***" @@ -1323,11 +1336,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg x264 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&x264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&x264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) if test x"$ffmpeg_x264" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libx264_encoder)], - ffmpeg_x264=yes,ffmpeg_x264=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libx264_encoder)]])],[ffmpeg_x264=yes],[ffmpeg_x264=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_x264" != x"no"; then @@ -1342,11 +1353,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg xvid support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&xvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&xvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) if test x"$ffmpeg_xvid" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libxvid_encoder)], - ffmpeg_xvid=yes,ffmpeg_xvid=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libxvid_encoder)]])],[ffmpeg_xvid=yes],[ffmpeg_xvid=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_xvid" != x"no"; then @@ -1361,11 +1370,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg mp3lame support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&mp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&mp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) if test x"$ffmpeg_mp3" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libmp3lame_encoder)], - ffmpeg_mp3=yes,ffmpeg_mp3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libmp3lame_encoder)]])],[ffmpeg_mp3=yes],[ffmpeg_mp3=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_mp3" != x"no"; then @@ -1380,11 +1387,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg aac support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&faac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&faac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) if test x"$ffmpeg_aac" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libfaac_encoder)], - ffmpeg_aac=yes,ffmpeg_aac=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libfaac_encoder)]])],[ffmpeg_aac=yes],[ffmpeg_aac=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_aac" != x"no"; then @@ -1399,8 +1404,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg ac3 support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&ac3_encoder)], - ffmpeg_ac3=yes,ffmpeg_ac3=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&ac3_encoder)]])],[ffmpeg_ac3=yes],[ffmpeg_ac3=no]) LIBS="$saved_LIBS" if test x"$ffmpeg_ac3" != x"no"; then AC_DEFINE(HAVE_FFMPEG_AC3, 1, ffmpeg is build with the ac3 support) @@ -1414,11 +1418,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_nb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) if test x"$ffmpeg_amr_nb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_nb_encoder)], - ffmpeg_amr_nb=yes,ffmpeg_amr_nb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_nb_encoder)]])],[ffmpeg_amr_nb=yes],[ffmpeg_amr_nb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_nb" != x"no"; then @@ -1433,11 +1435,9 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg amr_wb support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&amr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&amr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) if test x"$ffmpeg_amr_wb" == x"no"; then - AC_TRY_LINK([#include <ffmpeg/avformat.h>],[register_avcodec(&libamr_wb_encoder)], - ffmpeg_amr_wb=yes,ffmpeg_amr_wb=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avformat.h>]], [[register_avcodec(&libamr_wb_encoder)]])],[ffmpeg_amr_wb=yes],[ffmpeg_amr_wb=no]) fi LIBS="$saved_LIBS" if test x"$ffmpeg_amr_wb" != x"no"; then @@ -1453,9 +1453,7 @@ if test "x$enable_ffmpeg" != "xno"; then AC_MSG_CHECKING(for ffmpeg swscale support) saved_LIBS="$LIBS" LIBS="$saved_LIBS $FFMPEG_LIBS" - AC_TRY_LINK([#include <ffmpeg/avcodec.h>], - [img_convert(0, 0, 0,0,0,0)], - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ffmpeg/avcodec.h>]], [[img_convert(0, 0, 0,0,0,0)]])],[enable_ffmpeg_swscale=no],[enable_ffmpeg_swscale=yes]) LIBS="$saved_LIBS" AC_MSG_RESULT($enable_ffmpeg_swscale) @@ -1488,7 +1486,7 @@ dnl find if .align arg is power-of-two o asmalign_pot="unknown" -AC_TRY_COMPILE([asm (".align 3"); ], ,asmalign_pot=yes,asmalign_pot=no) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm (".align 3"); ]], [[]])],[asmalign_pot=yes],[asmalign_pot=no]) if test x"$asmalign_pot" == xyes; then asmalign_out=`echo \".align\" '#ZEROBITS' \"\\\n\\\t\"` @@ -1506,16 +1504,15 @@ dnl ------------------------------------ dnl Checks for XviD headers AC_MSG_CHECKING(for XviD header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <xvid.h> - ], - [ + ]], [[ #ifdef XVID_API xvid_gbl_init_t xinit; #else XVID_INIT_PARAM *xinit; #endif - ], xvid_header_ok=yes, xvid_header_ok=no) + ]])],[xvid_header_ok=yes],[xvid_header_ok=no]) AC_MSG_RESULT($xvid_header_ok) if test x"$xvid_header_ok" = xno; then @@ -1527,7 +1524,7 @@ dnl ------------------------------------ dnl Checks for XviD API version AC_MSG_CHECKING(if XviD API version is 2.1 or 4.0 or 4.1) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <xvid.h> int main() { #ifdef API_VERSION @@ -1537,7 +1534,7 @@ dnl Checks for XviD API version return 1; #endif #elif defined(XVID_API) - #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) + #if XVID_API == XVID_MAKE_API(4, 0) || XVID_API == XVID_MAKE_API(4, 1) || XVID_API == XVID_MAKE_API(4, 2) return 0; #else return 1; @@ -1545,13 +1542,11 @@ dnl Checks for XviD API version #else return 1; #endif } - ], - [ + ]])],[ xvid_api_version="yes" - ], - [ + ],[ xvid_api_version="no" - ]) + ],[]) AC_MSG_RESULT($xvid_api_version) if test "$xvid_api_version" = "no"; then @@ -1583,14 +1578,13 @@ dnl Checks for ogg / vorbis / theora hea if test "$enable_ogg" != "no"; then AC_MSG_CHECKING(for ogg-vorbis-theora header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <theora/theora.h> #include <vorbis/codec.h> #include <vorbis/vorbisenc.h> - ], - [ - ], ogg_header_ok=yes, ogg_header_ok=no) + ]], [[ + ]])],[ogg_header_ok=yes],[ogg_header_ok=no]) AC_MSG_RESULT($ogg_header_ok) if test x"$ogg_header_ok" = xno; then @@ -1667,10 +1661,9 @@ dnl Checks for divx4linux headers if test "$enable_divx4linux" != "no"; then AC_MSG_CHECKING(for divx4linux header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <encore2.h> - ], - [ + ]], [[ #if ENCORE_VERSION >= 20021024 DivXBitmapInfoHeader infos; SETTINGS param; @@ -1679,7 +1672,7 @@ if test "$enable_divx4linux" != "no"; th #endif ENC_FRAME fr; ENC_RESULT res; - ], divx_header_ok=yes, divx_header_ok=no) + ]])],[divx_header_ok=yes],[divx_header_ok=no]) AC_MSG_RESULT($divx_header_ok) if test x"$divx_header_ok" = xno; then @@ -1709,12 +1702,11 @@ dnl ------------------------------------ dnl Checks for lame headers AC_MSG_CHECKING(for lame header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <lame/lame.h> - ], - [ + ]], [[ lame_global_flags *gfp; - ], lame_header_ok=yes, lame_header_ok=no) + ]])],[lame_header_ok=yes],[lame_header_ok=no]) AC_MSG_RESULT($lame_header_ok) if test x"$lame_header_ok" = xno; then @@ -1793,7 +1785,7 @@ fi if test "$enable_zvbi" != "no"; then AC_MSG_CHECKING(for zvbi header files) - AC_TRY_COMPILE([#include <libzvbi.h>],,zvbi_h_ok=yes,zvbi_h_ok=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libzvbi.h>]], [[]])],[zvbi_h_ok=yes],[zvbi_h_ok=no]) AC_MSG_RESULT($zvbi_h_ok) if test "$zvbi_h_ok" = "yes"; then CFLAGS_sau="$CFLAGS" @@ -1817,12 +1809,11 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_faac" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for faac header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdlib.h> #include <faac.h> - ], - [ - ],faac_h_ok=yes,faac_h_ok=no) + ]], [[ + ]])],[faac_h_ok=yes],[faac_h_ok=no]) AC_MSG_RESULT($faac_h_ok) if test "$faac_h_ok" == yes; then @@ -1844,14 +1835,13 @@ if test "x$with_external_ffmpeg" != "xye if test "$enable_x264" != "no" -a "$enable_ffmpeg" != "no"; then AC_MSG_CHECKING(for x264 header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> #include <inttypes.h> #include <x264.h> - ], - [ + ]], [[ x264_t* try; - ], x264_h_ok=yes, x264_h_ok=no) + ]])],[x264_h_ok=yes],[x264_h_ok=no]) AC_MSG_RESULT($x264_h_ok) if test "$x264_h_ok" == "yes"; then @@ -1875,21 +1865,20 @@ if test "x$with_external_ffmpeg" != "xye dnl ^^ NO NO!! the kernel headers used to compile MUST be the same than dnl the ones which have been used to compile the current glibc !!! dnl see http://lkml.org/lkml/2000/7/27/10 - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <linux/dvb/frontend.h> - ],,dvb_drivers_ok=yes,dvb_drivers_ok=no) + ]], [[]])],[dvb_drivers_ok=yes],[dvb_drivers_ok=no]) AC_MSG_RESULT($dvb_drivers_ok) dnl check for LIBSDL headers AC_MSG_CHECKING(for libsdl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <SDL/SDL.h> #include <SDL/SDL_thread.h> - ], - [ + ]], [[ SDL_mutex *mutex; SDL_cond *cond; - ], libsdl_header_ok=yes, libsdl_header_ok=no) + ]])],[libsdl_header_ok=yes],[libsdl_header_ok=no]) AC_MSG_RESULT($libsdl_header_ok) if test "$libsdl_header_ok" != "no"; then @@ -1906,13 +1895,12 @@ if test "x$with_external_ffmpeg" != "xye dnl check for LIBCURL headers AC_MSG_CHECKING(for libcurl header files) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <curl/curl.h> - ], - [ + ]], [[ CURL *curl; CURLcode res; - ], libcurl_header_ok=yes, libcurl_header_ok=no) + ]])],[libcurl_header_ok=yes],[libcurl_header_ok=no]) AC_MSG_RESULT($libcurl_header_ok) if test "$libcurl_header_ok" != "no"; then @@ -1944,7 +1932,7 @@ dnl ------------------------------------ dnl Check for DBUS DBUS_REQS_MIN=0.35 -AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Use DBUS support]),, with_dbus=auto) +AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[Use DBUS support]),, with_dbus=auto) if test "x$with_dbus" != "xno"; then PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS_MIN, enable_dbus=yes, enable_dbus=no) @@ -2230,13 +2218,10 @@ dnl FFmpeg inside dnl --------------------------------------------------------------- AC_MSG_CHECKING([for socklen_t]) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> - #include <sys/socket.h>], - [socklen_t x;], - [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in], - [AC_MSG_RESULT([no]) ] - ) + #include <sys/socket.h>]], [[socklen_t x;]])],[AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKLEN_T,1,FFMPEG) echo "HAVE_SOCKLEN_T=yes" >> config.mak.in],[AC_MSG_RESULT([no]) + ]) LIBS="$saved_LIBS" @@ -3398,4 +3383,5 @@ fi dnl --------------------------------------------------------------------- dnl Writing results -AC_OUTPUT(config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile) +AC_CONFIG_FILES([config.mak Makefile alevt/Makefile src/Makefile font/Makefile xdtv.spec xdtv-mandriva.spec xdtv-fedora.spec xdtv-suse.spec xdtv_scan.sh xdtv_record.sh debian/xdtv.files slackware/build.conf XdTV.ad man/Makefile src/dvb/Makefile]) +AC_OUTPUT diff -up xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 xdtv-2.4.1cvs15/src/grab-v4l2.c --- xdtv-2.4.1cvs15/src/grab-v4l2.c.libv4l2 2009-04-08 16:16:12.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-v4l2.c 2009-04-08 16:16:12.000000000 +0200 @@ -48,6 +48,18 @@ #include "colorspace.h" #include "memcpy.h" #include "blackborder.h" + +#ifdef HAVE_LIBV4L2 || 1 +# include <libv4l2.h> +#else +# define v4l2_fd_open(fd, flags) (fd) +# define v4l2_open open +# define v4l2_close close +# define v4l2_ioctl ioctl +# define v4l2_mmap mmap +# define v4l2_munmap munmap +#endif + extern int x11_bigendian; static int fmts_xaw_to_v4l2[MAX_VIDEO_FMT] = { @@ -171,14 +183,14 @@ static int grab_open(struct device_t *de if (debug) fprintf (stderr, "v4l2: open\n"); - if (-1 == (bttvfd = open (device->video ? device->video : "/dev/video", O_RDWR))) + if (-1 == (bttvfd = v4l2_open (device->video ? device->video : "/dev/video", O_RDWR))) { - fprintf (stderr, "open %s: %s\n", + fprintf (stderr, "v4l2_open %s: %s\n", device->video ? device->video : "/dev/video", strerror (errno)); goto err; } - if (-1 == ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCAP,&drv.cap)) { fprintf (stderr, "driver is not v4l2\n"); goto err; @@ -217,7 +229,7 @@ static int grab_open(struct device_t *de for (drv.nfmts = 0; drv.nfmts < MAX_FORMAT; drv.nfmts++) { drv.fmt[drv.nfmts].index = drv.nfmts; drv.fmt[drv.nfmts].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (-1 == ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_ENUM_FMT, &drv.fmt[drv.nfmts])) break; } @@ -225,22 +237,22 @@ static int grab_open(struct device_t *de ioctl(bttvfd,VIDIOC_G_PARM,&drv.streamparm); drv.brightness.id = V4L2_CID_BRIGHTNESS; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.brightness)) drv.brightness.id = 0; drv.contrast.id = V4L2_CID_CONTRAST; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.contrast)) drv.contrast.id = 0; drv.hue.id = V4L2_CID_HUE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.hue)) drv.hue.id = 0; drv.saturation.id = V4L2_CID_SATURATION; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.saturation)) drv.saturation.id = 0; drv.mute.id = V4L2_CID_AUDIO_MUTE; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.mute)) drv.mute.id = 0; drv.volume.id = V4L2_CID_AUDIO_VOLUME; - if(-1 == ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_QUERYCTRL,&drv.volume) || drv.volume.minimum==drv.volume.maximum) drv.volume.id = 0; //exit(0); @@ -272,8 +284,8 @@ static int grab_open(struct device_t *de } /* frame buffer */ - if (-1 == ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { - perror ("ioctl VIDIOC_G_FBUF"); + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_G_FBUF, &ov_fbuf)) { + perror ("v4l2_ioctl VIDIOC_G_FBUF"); fprintf(stderr, "classical overlay is disabled"); ov_error=1; } else { @@ -303,19 +315,19 @@ static int grab_open(struct device_t *de gbformat.fmt.pix.pixelformat = drv.fmt[0].pixelformat; gbformat.fmt.pix.width = 768; gbformat.fmt.pix.height = 576; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &gbformat)) + perror("v4l2_ioctl VIDIOC_S_FMT"); gbformat.fmt.pix.pixelformat = -1; // to force changeformat... return 0; err: if (bttvfd != -1) { - close (bttvfd); + v4l2_close (bttvfd); bttvfd = -1; } if (vbifd != -1) { - close (vbifd); + v4l2_close (vbifd); vbifd = -1; } if(gb2!=NULL) free(gb2); @@ -331,9 +343,9 @@ grab_close () return 0; grab_audio (1, -1, NULL); if(grab) stop_capture(); - close(bttvfd); + v4l2_close(bttvfd); bttvfd = -1; - close(vbifd); + v4l2_close(vbifd); vbifd = -1; free(grab_v4l2.norms); grab_v4l2.norms = NULL; free(grab_v4l2.inputs); grab_v4l2.inputs = NULL; @@ -355,8 +367,8 @@ grab_overlay (int x, int y, int width, i { if (debug) fprintf (stderr, "v4l2: overlay off\n"); - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &zero)) + perror("v4l2_ioctl VIDIOC_OVERLAY"); overlay = 0; changeformat(&gbformat); return 0; @@ -385,14 +397,14 @@ grab_overlay (int x, int y, int width, i } } - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, &win)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, &win)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) { - if( -1 == ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { - perror("ioctl VIDIOC_OVERLAY"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_OVERLAY, &one)) { + perror("v4l2_ioctl VIDIOC_OVERLAY"); return -1; } overlay = 1; @@ -409,12 +421,12 @@ grab_queue (struct v4l2_buffer *gb) fprintf (stderr, "g%d", gb->index); if(overlay) {fprintf(stderr,"BIG PB\n");exit(1);} - if (-1 == ioctl (bttvfd, VIDIOC_QBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_QBUF, gb)) { if (errno == EAGAIN) fprintf (stderr, "grabber chip can't sync (no station tuned in?)\n"); else - fprintf (stderr, "ioctl VIDIOC_QBUF(%d): %s\n", + fprintf (stderr, "v4l2_ioctl VIDIOC_QBUF(%d): %s\n", gb->index, strerror (errno)); return -1; } @@ -452,9 +464,9 @@ grab_wait (struct v4l2_buffer *gb) return -1; } - if (-1 == ioctl (bttvfd, VIDIOC_DQBUF, gb)) + if (-1 == v4l2_ioctl (bttvfd, VIDIOC_DQBUF, gb)) { - perror ("ioctl VIDIOC_DQBUF"); + perror ("v4l2_ioctl VIDIOC_DQBUF"); return -1; } @@ -517,12 +529,12 @@ static int stop_capture(void) { while (gb_grab!=gb_sync) if(grab_wait(&gb2[imgw])<0) {reset(); break;} type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { - perror("ioctl VIDIOC_STREAMOFF"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMOFF,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMOFF"); return -1; } for(i = 0; i < nbufs; i++) - if(maps[i]!=NULL) munmap(maps[i],gb2[i].length); + if(maps[i]!=NULL) v4l2_munmap(maps[i],gb2[i].length); free(maps);free(gb2); maps=NULL; gb2=NULL; grab = 0; @@ -536,8 +548,8 @@ static int start_capture(void) { reqbufs.count = nbufs_default; reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; reqbufs.memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { - perror("ioctl VIDIOC_REQBUFS"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_REQBUFS, &reqbufs)) { + perror("v4l2_ioctl VIDIOC_REQBUFS"); return -1; } nbufs = reqbufs.count; @@ -550,22 +562,22 @@ static int start_capture(void) { gb2[i].index = i; gb2[i].type = V4L2_BUF_TYPE_VIDEO_CAPTURE; gb2[i].memory = V4L2_MEMORY_MMAP; - if (-1 == ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { - perror("ioctl VIDIOC_QUERYBUF"); + if (-1 == v4l2_ioctl(bttvfd, VIDIOC_QUERYBUF, &gb2[i], 0)) { + perror("v4l2_ioctl VIDIOC_QUERYBUF"); return -1; } - maps[i] = mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, + maps[i] = v4l2_mmap(NULL, gb2[i].length, PROT_READ | PROT_WRITE, MAP_SHARED, bttvfd, gb2[i].m.offset); if(maps[i] == MAP_FAILED) { - perror("mmap"); + perror("v4l2_mmap"); return -1; } } type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if(-1 == ioctl(bttvfd,VIDIOC_STREAMON,&type)) { - perror("ioctl VIDIOC_STREAMON"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_STREAMON,&type)) { + perror("v4l2_ioctl VIDIOC_STREAMON"); return -1; } grab = 1; @@ -587,8 +599,8 @@ static int changeformat(struct v4l2_form if(fmt->fmt.pix.pixelformat==-1) return -1; - if(-1 == ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { - perror("ioctl VIDIOC_S_FMT"); + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_FMT, fmt)) { + perror("v4l2_ioctl VIDIOC_S_FMT"); return -1; } if(!overlay) @@ -643,7 +655,7 @@ grab_tune (const struct CHANNEL* chan) memset(&f,0,sizeof(f)); f.type = V4L2_TUNER_ANALOG_TV; f.frequency = chan->freq; - if(ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) + if(v4l2_ioctl(bttvfd, VIDIOC_S_FREQUENCY, &f) == -1) perror("VIDIOC_S_FREQUENCY"); return 0; } @@ -654,7 +666,7 @@ grab_tuned () struct v4l2_tuner tuner; memset(&tuner,0,sizeof(tuner)); - if (-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if (-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) return 0; return tuner.signal ? 1 : 0; } @@ -666,8 +678,8 @@ grab_input (int input, int norm) if (-1 != input) { if (debug) fprintf (stderr, "v4l2: input: %d\n", input); - if( -1 == ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) - perror("ioctl VIDIOC_S_INPUT"); + if( -1 == v4l2_ioctl (bttvfd, VIDIOC_S_INPUT, &drv.inp[input].index)) + perror("v4l2_ioctl VIDIOC_S_INPUT"); } if (-1 != norm) { @@ -677,8 +689,8 @@ grab_input (int input, int norm) int overlay2 = overlay; if(overlay2) video_overlay (NULL); if(grab) stop_capture(); - if( -1 == ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { - perror("ioctl VIDIOC_S_STD"); + if( -1 == v4l2_ioctl(bttvfd, VIDIOC_S_STD, &drv.std[norm].id)) { + perror("v4l2_ioctl VIDIOC_S_STD"); return -1; } if(overlay2) @@ -701,8 +713,8 @@ static inline int control(int x,struct v if(ctrl->id == 0) return -1; c.id = ctrl->id; c.value = (float)x/65535*(ctrl->maximum-ctrl->minimum)+ctrl->minimum+0.5; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { - perror("ioctl VIDIOC_S_CTRL"); + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL, &c)) { + perror("v4l2_ioctl VIDIOC_S_CTRL"); return -1; } return 0; @@ -726,18 +738,18 @@ grab_audio (int mute, int volume, int *m if(mute !=-1 && drv.mute.id) { c.id = V4L2_CID_AUDIO_MUTE; c.value = mute; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE"); } if(volume !=-1 && drv.volume.id) { c.id = V4L2_CID_AUDIO_VOLUME; c.value = volume; - if(-1 == ioctl(bttvfd, VIDIOC_S_CTRL,&c)) + if(-1 == v4l2_ioctl(bttvfd, VIDIOC_S_CTRL,&c)) perror("VIDIOC_S_CTRL, V4L2_CID_AUDIO_VOLUME"); } if(mode) { memset(&tuner,0,sizeof(tuner)); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); if(*mode) { switch(*mode) { @@ -746,9 +758,9 @@ grab_audio (int mute, int volume, int *m case 3: tuner.audmode = V4L2_TUNER_MODE_LANG1; break; case 4: tuner.audmode = V4L2_TUNER_MODE_LANG2; break; } - if(-1 == ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_S_TUNER,&tuner)) perror("VIDIOC_S_TUNER"); - if(-1 == ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) + if(-1 == v4l2_ioctl(bttvfd,VIDIOC_G_TUNER,&tuner)) perror("VIDIOC_G_TUNER"); } switch(tuner.audmode) { diff -up xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 xdtv-2.4.1cvs15/src/Makefile.am --- xdtv-2.4.1cvs15/src/Makefile.am.libv4l2 2009-04-08 16:16:11.000000000 +0200 +++ xdtv-2.4.1cvs15/src/Makefile.am 2009-04-08 16:21:29.000000000 +0200 @@ -154,7 +154,7 @@ AM_CFLAGS = @CFLAGPTHREAD@ @DEBUG@ -Wall INCLUDES = -I../alevt -Idvb @FFMPEGINC@ @DBUS_CFLAGS@ -xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ +xdtv_LDADD = ../alevt/libalevt.a @FFMPEGLINK@ @DVBLINK@ @X_LIBS@ @LIBXAW@ @LIBXT@ @X_PRE_LIBS@ -lX11 @LIBXMU@ @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@ @LIBXV@ @LIBXDPMS@ @LIBJPEG@ @LIBASOUND@ @LIBXPM@ @LIBLIRC@ @LIBM@ @LIBASOUND@ @LIBPTHREAD@ @LIBDL@ @LIBDIVX@ @LIBLAME@ @LIBOGGALL@ @LIBXVID@ @LIBNET@ @LIBSEM@ @LIBOSS@ @XINERAMA_LIBS@ @LIBPNG@ @LIBSDL@ @LIBCURL@ @LIBFAAC@ @LIBX264@ @LIBZVBI@ @DBUS_LIBS@ @LIBAMRNB@ @LIBAMRWB@ @LIBV4L2_LIBS@ xdtv_LDFLAGS = -rdynamic @@ -168,7 +168,7 @@ xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @L install-exec-local: install-binPROGRAMS chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf -xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ +xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@ @LIBCURL@ @LIBV4L2_LIBS@ xdtv_scantv_SOURCES = xdtv_scantv.c grab-v4l.c grab-v4l2.c strtab.c colorspace.c frequencies.c translation.c xdtv-2.4.1cvs15-noldffmpeg.patch: --- NEW FILE xdtv-2.4.1cvs15-noldffmpeg.patch --- diff -up xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg xdtv-2.4.1cvs15/src/container-ffmpeg.c --- xdtv-2.4.1cvs15/src/container-ffmpeg.c.noldffmpeg 2009-04-06 21:22:44.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container-ffmpeg.c 2009-04-06 21:25:15.000000000 +0200 @@ -23,16 +23,8 @@ #ifdef HAVE_FFMPEG #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif static AVOutputFormat *av_output_fmt = NULL; static AVFormatContext *oc=NULL; diff -up xdtv-2.4.1cvs15/src/container.h.noldffmpeg xdtv-2.4.1cvs15/src/container.h --- xdtv-2.4.1cvs15/src/container.h.noldffmpeg 2009-04-06 21:20:21.000000000 +0200 +++ xdtv-2.4.1cvs15/src/container.h 2009-04-06 21:20:30.000000000 +0200 @@ -14,11 +14,7 @@ #include "strtab.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #endif enum { diff -up xdtv-2.4.1cvs15/src/divx.h.noldffmpeg xdtv-2.4.1cvs15/src/divx.h --- xdtv-2.4.1cvs15/src/divx.h.noldffmpeg 2009-04-06 21:21:07.000000000 +0200 +++ xdtv-2.4.1cvs15/src/divx.h 2009-04-06 21:21:28.000000000 +0200 @@ -31,17 +31,9 @@ #include "container.h" #ifdef HAVE_FFMPEG -#if HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> -#else -# include "avcodec.h" -#endif #if LIBAVCODEC_BUILD >= 4754 -#if HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif #endif #endif diff -up xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg xdtv-2.4.1cvs15/src/grab-dvb.c --- xdtv-2.4.1cvs15/src/grab-dvb.c.noldffmpeg 2009-04-06 21:25:47.000000000 +0200 +++ xdtv-2.4.1cvs15/src/grab-dvb.c 2009-04-06 21:27:11.000000000 +0200 @@ -44,29 +44,12 @@ #include "dvbtools.h" #include "avilib.h" -#if HAVE_LIBAVCODEC_AVCODEC_H # include <libavcodec/avcodec.h> # include <libavcodec/audioconvert.h> -#else -# include "avcodec.h" -# include "audioconvert.h" -#endif -#if HAVE_LIBAVFORMAT_AVFORMAT_H # include <libavformat/avformat.h> -#else -# include "avformat.h" -#endif -#if HAVE_LIBAVUTIL_COMMON_H # include <libavutil/common.h> -#else -# include "common.h" -#endif #ifdef HAVE_SWSCALE -#if HAVE_LIBSWSCALE_SWSCALE_H # include <libswscale/swscale.h> -#else -# include "swscale.h" -#endif #endif /* because this part of code was moved from mem.h to internal.h */ --- NEW FILE xdtv.desktop --- [Desktop Entry] Name=XdTV Comment=Capture View & Broadcast Video4Linux Streams Comment[fr]=Capturer Visualiser & Diffuser des flux v4l Exec=xdtv Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; --- NEW FILE xdtv.spec --- %define cvs cvs15 Name: xdtv Version: 2.4.1 Release: 0.5%{?cvs}%{?dist} Summary: Video4Linux Stream Capture Viewer & Recorder Group: Applications/Multimedia License: GPLv2+ URL: http://xawdecode.sourceforge.net/ Source0: http://downloads.sourceforge.net/xawdecode/xdtv-%{version}%{?cvs}.tar.gz Source1: xdtv_v4l-conf.pam Source2: xdtv.desktop Source3: xdtv_wizard.desktop Patch0: xdtv-2.4.1cvs15-noldffmpeg.patch Patch1: xdtv-2.4.1cvs15-libv4l2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-server-utils BuildRequires: yasm xterm BuildRequires: libtool automake17 BuildRequires: a52dec-devel BuildRequires: faac-devel BuildRequires: ffmpeg-devel BuildRequires: lame-devel BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: lirc-devel BuildRequires: libpng-devel BuildRequires: libv4l-devel BuildRequires: libvorbis-devel BuildRequires: xvidcore-devel BuildRequires: zvbi-devel BuildRequires: alsa-lib-devel BuildRequires: neXtaw-devel BuildRequires: SDL-devel BuildRequires: curl-devel BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel BuildRequires: libXpm-devel BuildRequires: libXinerama-devel BuildRequires: libXv-devel #Needed for consolehelper Requires: usermode %description XdTV is a software that allows you to to record & watch TV. It interacts with AleVT for Teletext and Nxtvepg for NextView, and uses the video4linux API. It can use some deinterlacing filters and can record video files in various containers (AVI, MPEG, OGG, etc.) with many codecs (FFMpeg(>=0.4.6), XviD(0.9 & 1.x), Ogg Theora (>=1.0alpha5) & Vorbis and DivX4/5). It has also some plugin capabilities. %package devel Summary: Developpement files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: neXtaw-devel Requires: libXt-devel %description devel Developpement files for %{name} %package OSD-font Summary: Font used by %{name} OSD function Group: User Interface/X Requires: %{name} = %{version}-%{release} %description OSD-font Font used by %{name} OSD function. # ----------------------------------------------------------------------------- %prep %setup -q -n %{name}-%{version}%{?cvs} # fix flags sed -i -e 's|PERF_FLAGS=|#PERF_FLAGS=|' src/Makefile.am src/Makefile.in # Fix plugdir for lib64 sed -i -e 's|lib/xdtv-plugins|%{_lib}/xdtv-plugins|' src/plugin.c # Convert not UTF-8 files mkdir -p __temp for f in README.ffmpeg README.lirc README.xvid FAQfr-xdtv ;do cp -p $f __temp/$f iconv -f ISO-8859-1 -t UTF-8 __temp/$f > $f touch -r __temp/$f $f done rm -rf __temp #Fix for alevtparams_ui.c sed -i.neXtaw -e 's|X11/Xaw|X11/neXtaw|g' src/*.{c,h} src/devicemanager/devicemanager_ui.c #Patching to remove doubfully support for oldish ffmpeg %patch0 -p1 -b .noldffmpeg %patch1 -p1 -b .libv4l2 #Prevent internal ffmpeg to be used. rm -rf libav* libpostproc libswscale #hack xvidAPI - added in patch1 #sed -i.xvid42 -e 's/4, 0/4, 2/' configure.in configure autoreconf -vif # ----------------------------------------------------------------------------- %build export CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" export CPPFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags libavformat libavcodec)" %configure --disable-divx4linux \ --enable-arch-detection \ --enable-cpu-options \ --disable-static \ --with-fontdir=%{_datadir}/X11/fonts/misc --enable-smallfont \ --enable-pixmaps \ --with-external-ffmpeg \ --with-dbus make %{?_smp_mflags} # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p " install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' # Make xdtv owns the plugin dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv-plugins # Make xdtv owns the locales dir mkdir -p $RPM_BUILD_ROOT%{_libdir}/xdtv # remove the setuid root of this file (need to be root to use it) chmod 0755 $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # xdtv_v4l-conf stuff - inspired from xawtv mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdtv_v4l-conf cat >xdtv_v4l-conf.apps <<! SESSION=true USER=root PROGRAM=%{_sbindir}/xdtv_v4l-conf ! install -m 0644 xdtv_v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xdtv_v4l-conf mv $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/xdtv_v4l-conf # Deprecated rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.dir rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/fonts/misc/fonts.scale #Icons for i in 16 32 48 ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps install -pm 0644 %{name}-${i}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done #Desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE2} desktop-file-install \ --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 0644 \ %{SOURCE3} # ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %{_bindir}/update-desktop-database %{_datadir}/applications || : %postun %{_bindir}/update-desktop-database %{_datadir}/applications touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : %post OSD-font if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi %postun OSD-font if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/X11/fonts/misc fi fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING INSTALL FAQfr-xdtv TODO %doc README README.dvb README.record README.bs README.ffmpeg README.streaming %doc README.bsd README.gentoo README.xvid README.buildme README.lirc %doc README.deinterlace README.plugins ChangeLog lisez-moi xdtvrc.sample %doc lircrc.miro.sample lircrc.hauppauge.sample lircrc.animax.sample %doc lircrc.WinfastTV2000.sample %{_sbindir}/xdtv_v4l-conf %{_bindir}/xdtv* %{_datadir}/X11/app-defaults/XdTV %config %{_sysconfdir}/pam.d/xdtv_v4l-conf %config %{_sysconfdir}/security/console.apps/xdtv_v4l-conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en.conf %config %{_sysconfdir}/xdtv/%{name}_wizard-en-UTF8.conf %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/xdtv/ %{_datadir}/applications/*xdtv.desktop %{_datadir}/applications/*xdtv_wizard.desktop %{_mandir}/man1/*.1.gz # Directory for plugins %dir %{_libdir}/xdtv-plugins # Directory for locales %dir %{_libdir}/xdtv %files devel %defattr(-,root,root,-) %{_includedir}/%{name}/ %files OSD-font %defattr(-,root,root,-) %{_datadir}/X11/fonts/misc/*.pcf.gz %changelog * Wed Apr 8 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.5cvs15 - Add libv4l2 support - Fix xvidcore API 4.2 - Remove hardcoded PERF_FLAGS - Add desktop files in SOURCE * Mon Apr 6 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.4cvs15 - Update to 2.4.1cvs15 * Mon Jan 5 2009 kwizart < kwizart at gmail.com > - 2.4.1-0.3cvs14 - Update to 2.4.1cvs14 * Mon Oct 14 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.2cvs13 - Add PAM support - picked from xawtv (instead of having xdtv_v4l-conf to be setuid root) - Re-order configure options - Only use neXtaw instead of Xaw * Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs13 - Update to 2.4.1cvs13 * Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs12 - Update to 2.4.1cvs12 * Tue Mar 25 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs8 - Update to 2.4.1cvs8 * Sat Jan 12 2008 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs5 - Update to 2.4.1cvs5 * Thu Dec 6 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs4 - Update to 2.4.1cvs4 * Wed Nov 7 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs3 - Update to 2.4.1cvs3 * Thu Oct 25 2007 kwizart < kwizart at gmail.com > - 2.4.1-0.1cvs2 - Update to pre 2.4.1 cvs2 - Fix the plugin directory on lib64 - Remove info post postun * Mon Feb 27 2007 kwizart < kwizart at gmail.com > - 2.4.0-1 - Update to final 2.4.0 - remove desktop file vendor and add category * Mon Feb 05 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.10.pre0 - Fix compile flags * Wed Jan 3 2007 kwizart < kwizart at gmail.com > - 2.4.0-0.9.pre0 - ffmpeg-rebuild - some patches from gentoo - conform to versioning guidelines - tweak some includes in divx.h - Enabled Optimization * Sun Dec 17 2006 kwizart < kwizart at gmail.com > 2.4.0pre0-8.kwizart.fc6 - Try to use ffmpeg-amr-devel with static lib with xdtv * Sun Dec 10 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-7.kwizart.fc6 - Cleaned spec file. * Sat Nov 11 2006 kwizart < kwizart at gmail.com > 0:2.4.0pre0-6.kwizart.fc6 - libdir in configure. - cleaned spec file for livna.org. - Now use updated ffmpeg tarball from livna 20061030 src.rpm. - Re-use x264 from livna. * Wed Nov 06 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-5.kwizart.fc6 - New release for fc6 * Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-4.kwizart.FC5 - dropped x264 - recent x264 version won't build with xdtv - man files are in correct place. * Sat Sep 22 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-3.kwizart.FC5 - amr support (amrnb_float amrwb_float). * Sun Sep 16 2006 kwizart < kwizart at gmail.com > - 0:2.4.0pre0-2.kwizart.FC5 - Cleaned $RPM_BUILD_ROOT tags / - Problem with application cache / fixed? * Fri Aug 04 2006 kwizart < kwizart at gmail.com > - switch to livna release * Sat Mar 25 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc5 - 2.3.2 on FC5 - The system app-defaults/ directory for X resources is now /usr/share/X11/app-defaults/ on Fedora Core 5 and for future Red Hat Enterprise Linux systems. - FC5 has modular X. All the libraries that were in xorg-x11-devel now have their own packages and you need to include the -devel packages for the libraries your project is actually using. - all infos here: http://fedora.redhat.com/docs/release-notes/fc5/ - new paths for desktop icons & TV misc fonts & font utils * Sun Mar 19 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.2-1fc4 - 2.3.2 - fix error with the instalation of the TV fonts (need chkfontpath). - fix error with the path of the ressource file (not the same path than in a Mandriva distro). - fix error with the menu update (the menu was not updated). - fix error with the path of the man files (return back to the old method). * Fri Feb 24 2006 Sir Pingus <pingus_77(a)yahoo.fr> 2.3.1-1fc4 - 2.3.1 - FFmpeg inside XdTV - Add the possibility to compile with amr_nb & amr_wb * Fri Dec 23 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.3.0-1 - 2.3.0 - Compiled with --disable-divx4linux & neXtaw - Spec file updated * Sun Jul 03 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-2 - add the xdtv_wizard menu entry * Fri Jul 01 2005 Sir Pingus <pingus_77(a)yahoo.fr> - 2.2.0-1 - Upgrade to 2.2.0 - Compiled with --disable-divx4linux - Spec file cleanup * Sun Apr 03 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.1.1-1 - Upgrade to 2.1.1 * Sun Jan 02 2005 Emmanuel Seyman <seyman(a)wanadoo.fr> - 2.0.1-1 - Upgrade to 2.0.1 - Obsolete xawdecode - Clean up installation instructions * Fri Nov 28 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.2-1 - Upgrade to 1.8.2 * Sat Oct 04 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.1-1 - Upgrade to 1.8.1 * Tue Sep 02 2003 Emmanuel Seyman <seyman(a)wanadoo.fr> - 1.8.0-1 - Initial RPM release. --- NEW FILE xdtv_v4l-conf.pam --- #%PAM-1.0 auth sufficient pam_rootok.so auth required pam_console.so account required pam_permit.so session required pam_permit.so session optional pam_xauth.so --- NEW FILE xdtv_wizard.desktop --- [Desktop Entry] Name=XdTV Wizard Comment=XdTV Wizard Exec=xdtv_wizard Icon=xdtv Terminal=false Type=Application Categories=AudioVideo; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xdtv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2009 11:10:52 -0000 1.1 +++ .cvsignore 13 May 2009 11:14:39 -0000 1.2 @@ -0,0 +1 @@ +xdtv-2.4.1cvs15.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/xdtv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2009 11:10:52 -0000 1.1 +++ sources 13 May 2009 11:14:39 -0000 1.2 @@ -0,0 +1 @@ +890a6c98c904326be88d163cdf602018 xdtv-2.4.1cvs15.tar.gz

15 years, 6 months

1
0
0 / 0

rpms/xdtv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xdtv/devel In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsk27909/rpms/xdtv/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdtv --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xdtv # $Id: Makefile,v 1.1 2009/05/13 11:10:52 thl Exp $ NAME := xdtv SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources ---

15 years, 6 months

1
0
0 / 0

rpms/xdtv Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xdtv In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsk27909/rpms/xdtv Added Files: Makefile import.log pkg.acl Log Message: Setup of module xdtv --- NEW FILE Makefile --- # Top level Makefile for module xdtv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl ---

15 years, 6 months

1
0
0 / 0

rpms/xdtv - New directory

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xdtv In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsk27909/rpms/xdtv Log Message: Directory /cvs/free/rpms/xdtv added to the repository

15 years, 6 months

1
0
0 / 0

rpms/xdtv/devel - New directory

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xdtv/devel In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsk27909/rpms/xdtv/devel Log Message: Directory /cvs/free/rpms/xdtv/devel added to the repository

15 years, 6 months

1
0
0 / 0

rpms/vlc/devel 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch, NONE, 1.1 vlc.spec, 1.32, 1.33 vlc-1.0.0-bugfix_backport.patch, 1.1, 1.2

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25620 Modified Files: vlc.spec vlc-1.0.0-bugfix_backport.patch Added Files: 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch Log Message: 0.5 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch: --- NEW FILE 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch --- >From b0b453e4e70073d63aebe6bb259f4c891ba08c21 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet (kwizart) <kwizart(a)gmail.com> Date: Wed, 13 May 2009 11:17:44 +0200 Subject: [PATCH] Fix missing symbol in libxvmc_plugin.so the XvMC plugin use xcommon.c where some part use HAVE_XINERAMA conditions. Missing symbols are : XineramaQueryScreens XineramaQueryExtension XineramaIsActive --- configure.ac | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index be6e24c..414a29d 100644 --- a/configure.ac +++ b/configure.ac @@ -4106,12 +4106,14 @@ AS_IF([test "$enable_xinerama" != "no"], [ VLC_ADD_LIBS([xvideo],[-lXinerama_pic]) VLC_ADD_LIBS([x11],[-lXinerama_pic]) VLC_ADD_LIBS([glx],[-lXinerama_pic]) + VLC_ADD_LIBS([xvmc],[-lXinerama_pic]) ac_cv_have_xinerama="yes" ],[ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ VLC_ADD_LIBS([xvideo],[-lXinerama]) VLC_ADD_LIBS([x11],[-lXinerama]) VLC_ADD_LIBS([glx],[-lXinerama]) + VLC_ADD_LIBS([xvmc],[-lXinerama]) ac_cv_have_xinerama="yes" ]) ]) -- 1.6.0.6 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- vlc.spec 12 May 2009 13:27:28 -0000 1.32 +++ vlc.spec 13 May 2009 10:35:08 -0000 1.33 @@ -13,7 +13,7 @@ Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc Version: 1.0.0 -Release: 0.4rc1%{?dist} +Release: 0.5rc1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org/ @@ -27,6 +27,7 @@ Patch5: vlc-1.0.0-pre1-xulrunner-191_support.patch Patch6: vlc-1.0.0-bugfix_backport.patch Patch7: vlc-1.0.0-rc1-pkglibd.patch +Patch8: 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -173,9 +174,6 @@ It can also be used as a server to stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network. -Non-default rpmbuild options: ---with dirac: Enable dirac codec support ---with kate: Enable kate codec support %description devel @@ -247,6 +245,7 @@ %endif %patch6 -p1 -b .bp %patch7 -p1 -b .pkglibd +%patch8 -p1 -b .xvmc rm autotools/* m4/lib* cp -p %{_datadir}/gettext/config.rpath autotools @@ -507,6 +506,10 @@ %changelog +* Wed May 13 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.5rc1 +- Fix missing XvMC symbols +- Fix export make_URI + * Tue May 12 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.4rc1 - Update to 1.0.0-rc1 - Add 1.0-bugfix patches vlc-1.0.0-bugfix_backport.patch: Index: vlc-1.0.0-bugfix_backport.patch =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc-1.0.0-bugfix_backport.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vlc-1.0.0-bugfix_backport.patch 12 May 2009 13:27:28 -0000 1.1 +++ vlc-1.0.0-bugfix_backport.patch 13 May 2009 10:35:08 -0000 1.2 @@ -1,3 +1,15 @@ +diff --git a/src/libvlccore.sym b/src/libvlccore.sym +index ac68b0e..d72c10f 100644 +--- a/src/libvlccore.sym ++++ b/src/libvlccore.sym +@@ -216,6 +216,7 @@ libvlc_InternalInit + libvlc_InternalWait + libvlc_Quit + LocaleFree ++make_URI + mdate + module_config_free + module_config_get diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index 4085e25..5794c0a 100644 --- a/include/vlc/libvlc.h

15 years, 6 months

1
0
0 / 0

rpms/wl-kmod/devel wl-kmod.spec,1.32,1.33

by Thorsten Leemhuis

Author: thl Update of /cvs/nonfree/rpms/wl-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3601 Modified Files: wl-kmod.spec Log Message: * Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.5 - rebuild for new kernels Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- wl-kmod.spec 5 May 2009 06:27:07 -0000 1.32 +++ wl-kmod.spec 13 May 2009 04:45:12 -0000 1.33 @@ -7,7 +7,7 @@ Name: wl-kmod Version: 5.10.79.10 -Release: 2%{?dist}.4 +Release: 2%{?dist}.5 Summary: Kernel module for broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.5 +- rebuild for new kernels + * Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.4 - rebuild for new kernels

15 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits May 2009