September 2008 - rpmfusion-commits

rpms/jbigkit/devel jbigkit-2.0-shlib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jbigkit.spec, 1.2, 1.3 sources, 1.2, 1.3 jbigkit-1.6-shlib.patch, 1.1, NONE

by David Woodhouse

Author: dwmw2 Update of /cvs/free/rpms/jbigkit/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15381 Modified Files: .cvsignore jbigkit.spec sources Added Files: jbigkit-2.0-shlib.patch Removed Files: jbigkit-1.6-shlib.patch Log Message: 2.0 jbigkit-2.0-shlib.patch: --- NEW FILE jbigkit-2.0-shlib.patch --- --- jbigkit/pbmtools/Makefile.shlib 2008-08-25 23:26:39.000000000 +0100 +++ jbigkit/pbmtools/Makefile 2008-09-03 16:22:02.000000000 +0100 @@ -10,18 +10,18 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l .SUFFIXES: .1 .5 .txt $(SUFFIXES) all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \ - pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt +# pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a +pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a +jbgtopbm: jbgtopbm.o ../libjbig/libjbig.so $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a +pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.so $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a +jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.so $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h @@ -29,13 +29,13 @@ pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h -../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \ +../libjbig/libjbig.so: ../libjbig/jbig.c ../libjbig/jbig.h \ ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h - make -C ../libjbig libjbig.a + make -C ../libjbig libjbig.so -../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \ +../libjbig/libjbig85.so: ../libjbig/jbig85.c ../libjbig/jbig85.h \ ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h - make -C ../libjbig libjbig85.a + make -C ../libjbig libjbig85.so test: test82 test85 --- jbigkit/libjbig/Makefile.shlib 2008-08-30 18:20:52.000000000 +0100 +++ jbigkit/libjbig/Makefile 2008-09-03 16:22:02.000000000 +0100 @@ -5,25 +5,27 @@ CC = gcc # Options for the compiler: A high optimization level is suggested -CFLAGS = -g -O -Wall -ansi -pedantic # --coverage +CFLAGS ?= -g -O -Wall -ansi -pedantic # --coverage +PICFLAGS := -fPIC -DPIC -all: libjbig.a tstcodec tstcodec85 +all: libjbig.so.$(VERSION) tstcodec tstcodec85 -tstcodec: tstcodec.o jbig.o jbig_ar.o - $(CC) $(CFLAGS) -o tstcodec $+ +tstcodec: tstcodec.o libjbig.so + $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o - $(CC) $(CFLAGS) -o tstcodec85 $+ +tstcodec85: tstcodec85.o libjbig85.so + $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig -libjbig.a: jbig.o jbig_ar.o - rm -f libjbig.a - ar rc libjbig.a jbig.o jbig_ar.o - -ranlib libjbig.a +%.so: %.so.$(VERSION) + ln -sf $< $@ -libjbig85.a: jbig85.o jbig_ar.o - rm -f libjbig85.a - ar rc libjbig85.a jbig85.o jbig_ar.o - -ranlib libjbig85.a +libjbig.so.$(VERSION): jbig.o jbig_ar.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ + +libjbig85.so.$(VERSION): jbig85.o jbig_ar.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ + +jbig.o jbig85.o jbig_ar.o: CFLAGS += $(PICFLAGS) jbig.o: jbig.c jbig.h jbig_ar.h jbig85.o: jbig85.c jbig85.h jbig_ar.h @@ -37,12 +39,12 @@ jbig.pot: jbig.c --msgid-bugs-address='http://www.cl.cam.ac.uk/~mgk25/jbigkit/' $+ test: tstcodec tstcodec85 - ./tstcodec - ./tstcodec85 + LD_LIBRARY_PATH=`pwd` ./tstcodec + LD_LIBRARY_PATH=`pwd` ./tstcodec85 t82test.pbm: tstcodec - ./tstcodec $@ + LD_LIBRARY_PATH=`pwd` ./tstcodec $@ clean: rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm - rm -f tstcodec tstcodec85 + rm -f tstcodec tstcodec85 *.so *.so.$(VERSION) --- jbigkit/Makefile.shlib 2008-08-30 21:40:22.000000000 +0100 +++ jbigkit/Makefile 2008-09-03 16:24:10.000000000 +0100 @@ -11,24 +11,25 @@ CCFLAGS = -O2 -W CFLAGS = $(CCFLAGS) -I../libjbig VERSION=2.0 +export VERSION CFLAGS CC all: lib pbm @echo "Enter 'make test' in order to start some automatic tests." lib: - (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") + make -C libjbig pbm: lib - (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") + make -C pbmtools test: lib pbm - (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) - (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) + LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test + LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test clean: rm -f *~ core - (cd libjbig; make clean) - (cd pbmtools; make clean) + make -C libjbig clean + make -C pbmtools clean distribution: clean rm -f libjbig/libjbig*.a Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 12:19:03 -0000 1.2 +++ .cvsignore 3 Sep 2008 15:34:54 -0000 1.3 @@ -1 +1 @@ -jbigkit-1.6.tar.gz +jbigkit-2.0.tar.gz Index: jbigkit.spec =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/jbigkit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jbigkit.spec 3 Aug 2008 12:20:38 -0000 1.2 +++ jbigkit.spec 3 Sep 2008 15:34:54 -0000 1.3 @@ -1,13 +1,13 @@ Name: jbigkit -Version: 1.6 -Release: 3%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: JBIG1 lossless image compression tools Group: Applications/Multimedia License: GPL URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/ Source0: http://www.cl.cam.ac.uk/~mgk25/download/%{name}-%{version}.tar.gz -Patch0: jbigkit-1.6-shlib.patch +Patch0: jbigkit-2.0-shlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package libs @@ -59,11 +59,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m0755 libjbig/libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir} +install -p -m0755 libjbig/libjbig85.so.%{version} $RPM_BUILD_ROOT/%{_libdir} ln -sf libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libjbig.so +ln -sf libjbig85.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libjbig85.so install -p -m0644 libjbig/jbig.h $RPM_BUILD_ROOT%{_includedir} +install -p -m0644 libjbig/jbig85.h $RPM_BUILD_ROOT%{_includedir} install -p -m0755 pbmtools/???to??? $RPM_BUILD_ROOT%{_bindir} +install -p -m0755 pbmtools/???to???85 $RPM_BUILD_ROOT%{_bindir} install -p -m0644 pbmtools/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean @@ -78,21 +82,23 @@ %files %defattr(-,root,root,-) -%{_bindir}/???to??? +%{_bindir}/???to* %{_mandir}/man1/* - %files libs -%{_libdir}/libjbig.so.%{version} +%{_libdir}/libjbig*.so.%{version} %doc COPYING ANNOUNCE TODO INSTALL CHANGES %files devel -%{_libdir}/libjbig.so -%{_includedir}/jbig.h - +%{_libdir}/libjbig*.so +%{_includedir}/jbig*.h +# Don't obfuscate email address here, please. %changelog -* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.6-3 +* Wed Sep 03 2008 David Woodhouse <dwmw2(a)infradead.org> 2.0-1 +- Update to 2.0 + +* Sun Aug 03 2008 Thorsten Leemhuis <fedora(a)leemhuis.info> - 1.6-3 - rebuild * Sun Oct 1 2006 David Woodhouse <dwmw2(a)infradead.org> 1.6-2 Index: sources =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 12:19:03 -0000 1.2 +++ sources 3 Sep 2008 15:34:54 -0000 1.3 @@ -1 +1 @@ -ce196e45f293d40ba76af3dc981ccfd7 jbigkit-1.6.tar.gz +3dd87f605abb1a97a22dc79d8b3e8f6c jbigkit-2.0.tar.gz --- jbigkit-1.6-shlib.patch DELETED ---

16 years, 2 months

1
0
0 / 0

rpms/vlc/F-9 sources,1.2,1.3 .cvsignore,1.2,1.3

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv14884 Modified Files: sources .cvsignore Log Message: Updloaded Sources Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Aug 2008 17:56:44 -0000 1.2 +++ sources 3 Sep 2008 15:26:21 -0000 1.3 @@ -1,2 +1,2 @@ -4a6eece2f56d4ad5dfa786e934d2b4a8 vlc-0.8.6h.tar.bz2 +3c90520c9f22a68d287458d5a8af989e vlc-0.8.6i.tar.bz2 64521246371c2706eb8375cc38e5233b vlvc_source-0.8.tgz Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Aug 2008 17:56:44 -0000 1.2 +++ .cvsignore 3 Sep 2008 15:26:21 -0000 1.3 @@ -1,2 +1,2 @@ -vlc-0.8.6h.tar.bz2 +vlc-0.8.6i.tar.bz2 vlvc_source-0.8.tgz

16 years, 2 months

1
0
0 / 0

rpms/libfame/F-8 libfame-0.9.1-fstrict-aliasing.patch, NONE, 1.1 libfame-0.9.1-gcc34-1.patch, NONE, 1.1 libfame-0.9.1-underquoted.patch, NONE, 1.1 libfame-0.9.1-x86_64.patch, NONE, 1.1 libfame-aclocal18.patch, NONE, 1.1 libfame-config-rpath.patch, NONE, 1.1 libfame-gccver.patch, NONE, 1.1 libfame-nomarch.patch, NONE, 1.1 libfame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/libfame/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv14157 Modified Files: .cvsignore sources Added Files: libfame-0.9.1-fstrict-aliasing.patch libfame-0.9.1-gcc34-1.patch libfame-0.9.1-underquoted.patch libfame-0.9.1-x86_64.patch libfame-aclocal18.patch libfame-config-rpath.patch libfame-gccver.patch libfame-nomarch.patch libfame.spec Log Message: initial import from devel branch libfame-0.9.1-fstrict-aliasing.patch: --- NEW FILE libfame-0.9.1-fstrict-aliasing.patch --- --- libfame-0.9.1.orig/configure.in 2008-08-15 23:50:51.000000000 -0400 +++ libfame-0.9.1/configure.in 2008-08-15 23:55:14.000000000 -0400 @@ -90,26 +90,9 @@ dnl See if we need to pass -lm for the m AC_CHECK_LIB(m, sqrt, LIBS="$LIBS -lm") dnl Optimize +dnl enable -fstrict-aliasing unconditionally if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" - -dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95 - gcc_major_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - gcc_minor_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - gcc_micro_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - - dnl ok, I must admit I don't know how to do or/and ;) - if test $gcc_major_version -eq 2; then - if test $gcc_minor_version -gt 94; then - CFLAGS="$CFLAGS -fstrict-aliasing" - fi - fi - if test $gcc_major_version -gt 2; then - CFLAGS="$CFLAGS -fstrict-aliasing" - fi + CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math -fstrict-aliasing" fi dnl Check for debugging support libfame-0.9.1-gcc34-1.patch: --- NEW FILE libfame-0.9.1-gcc34-1.patch --- Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> Date: 2004-09-04 Initial Package Version: 0.9.1 Upstream Status: Not submitted Origin: Randy McMurchy Description: Fixes libfame library when compiled with GCC-3.4.x $LastChangedBy: randy $ $Date: 2004-09-05 00:11:51 -0600 (Sun, 05 Sep 2004) $ diff -Naur libfame-0.9.1-orig/src/half_mmx.h libfame-0.9.1/src/half_mmx.h --- libfame-0.9.1-orig/src/half_mmx.h 2002-04-30 18:04:02.000000000 +0000 +++ libfame-0.9.1/src/half_mmx.h 2004-09-05 03:49:09.666845896 +0000 @@ -18,7 +18,7 @@ */ /**************************** half-pixel interpolation ***********************/ -static short const _mmx_one[] = { 1, 1, 1, 1 }; +const _mmx_one[] = { 1, 1, 1, 1 }; static void inline mmx_interpolate(unsigned char **ref, int pitch, diff -Naur libfame-0.9.1-orig/src/half_sse.h libfame-0.9.1/src/half_sse.h --- libfame-0.9.1-orig/src/half_sse.h 2002-01-27 02:24:56.000000000 +0000 +++ libfame-0.9.1/src/half_sse.h 2004-09-05 03:49:39.894250632 +0000 @@ -19,7 +19,7 @@ */ /**************************** half-pixel interpolation ***********************/ -static short const _mmx_one[] = { 1, 1, 1, 1 }; +const _mmx_one[] = { 1, 1, 1, 1 }; static unsigned char const _mmx_one_byte[] = {1,1,1,1,1,1,1,1}; libfame-0.9.1-underquoted.patch: --- NEW FILE libfame-0.9.1-underquoted.patch --- diff -Naupr libfame-0.9.1.orig/libfame.m4.in libfame-0.9.1/libfame.m4.in --- libfame-0.9.1.orig/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100 +++ libfame-0.9.1/libfame.m4.in 2006-09-18 20:38:20.000000000 +0200 @@ -3,7 +3,7 @@ dnl Test for libfame, and define LIBFAME dnl Vivien Chappelier 12/11/00 dnl stolen from ORBit autoconf dnl -AC_DEFUN(AM_PATH_LIBFAME, +AC_DEFUN([AM_PATH_LIBFAME], [dnl dnl Get the cflags and libraries from the libfame-config script dnl libfame-0.9.1-x86_64.patch: --- NEW FILE libfame-0.9.1-x86_64.patch --- diff -Naupr libfame-0.9.1.orig/src/fame_malloc.c libfame-0.9.1/src/fame_malloc.c --- libfame-0.9.1.orig/src/fame_malloc.c 2003-06-20 14:40:30.000000000 +0200 +++ libfame-0.9.1/src/fame_malloc.c 2005-09-30 11:08:48.000000000 +0200 @@ -36,9 +36,9 @@ void* fame_malloc(size_t size) */ ptr = (unsigned char*) malloc(size+ALIGN); - aligned = (unsigned char*) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN ); + aligned = (unsigned char*) (((unsigned long)ptr &(~(ALIGN-1))) + ALIGN ); padding = aligned - 1; - *padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1)); + *padding = (ALIGN-1) - ((unsigned long)ptr & (ALIGN-1)); return ((void*)aligned); } libfame-aclocal18.patch: --- NEW FILE libfame-aclocal18.patch --- --- libfame.m4.in~ 2001-11-20 13:56:37.000000000 +0200 +++ libfame.m4.in 2004-07-17 22:44:13.241838905 +0300 @@ -3,7 +3,7 @@ dnl Vivien Chappelier 12/11/00 dnl stolen from ORBit autoconf dnl -AC_DEFUN(AM_PATH_LIBFAME, +AC_DEFUN([AM_PATH_LIBFAME], [dnl dnl Get the cflags and libraries from the libfame-config script dnl libfame-config-rpath.patch: --- NEW FILE libfame-config-rpath.patch --- --- libfame-config.in~ 2001-06-22 14:10:59.000000000 +0300 +++ libfame-config.in 2004-07-17 22:47:55.867418653 +0300 @@ -48,7 +48,7 @@ if [ "`uname`" = "SunOS" ]; then libdirs="-L@libdir@ -R@libdir@" else - libdirs="-L@libdir@ @FAME_RLD_FLAGS@" + libdirs="-L@libdir@" fi echo $libdirs -lfame ;; libfame-gccver.patch: --- NEW FILE libfame-gccver.patch --- diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in --- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200 +++ libfame-0.9.1/configure.in 2004-07-17 23:26:07.421758515 +0300 @@ -101,11 +101,11 @@ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95 - gcc_major_version=`$CC --version | \ + gcc_major_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - gcc_minor_version=`$CC --version | \ + gcc_minor_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - gcc_micro_version=`$CC --version | \ + gcc_micro_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` dnl ok, I must admit I don't know how to do or/and ;) diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure --- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200 +++ libfame-0.9.1/configure 2004-07-17 23:26:07.422758205 +0300 @@ -4607,11 +4607,11 @@ if test x$ac_cv_c_compiler_gnu = xyes; then CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" - gcc_major_version=`$CC --version | \ + gcc_major_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'` - gcc_minor_version=`$CC --version | \ + gcc_minor_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'` - gcc_micro_version=`$CC --version | \ + gcc_micro_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'` if test $gcc_major_version -eq 2; then libfame-nomarch.patch: --- NEW FILE libfame-nomarch.patch --- diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure --- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200 +++ libfame-0.9.1/configure 2004-07-18 00:01:13.266432497 +0300 @@ -4505,18 +4505,11 @@ fi ;; i386-*-*) - if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i386" - fi - ;; - i486-*-*) - if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP" - fi + true ;; i?86-*-*) if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP" + CFLAGS="$CFLAGS -DHAS_BSWAP" fi ;; esac diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in --- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200 +++ libfame-0.9.1/configure.in 2004-07-18 00:01:01.288132690 +0300 @@ -61,18 +61,11 @@ fi ;; i386-*-*) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i386" - fi - ;; - i486-*-*) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP" - fi + true ;; i?86-*-*) if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP" + CFLAGS="$CFLAGS -DHAS_BSWAP" fi ;; esac --- NEW FILE libfame.spec --- Summary: Fast Assembly MPEG Encoding library Name: libfame Version: 0.9.1 Release: 13%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://download.sourceforge.net/fame/%{name}-%{version}.tar.gz Patch0: %{name}-aclocal18.patch Patch1: %{name}-config-rpath.patch Patch2: %{name}-gccver.patch Patch3: %{name}-nomarch.patch Patch4: http://www.linuxfromscratch.org/blfs/downloads/svn/libfame-0.9.1-gcc34-1.... Patch5: libfame-0.9.1-fstrict-aliasing.patch Patch6: libfame-0.9.1-x86_64.patch URL: http://fame.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, automake, libtool %description FAME is a library for fast MPEG encoding. %package devel Summary: Libraries and include to develop using FAME Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel FAME is a library for fast MPEG encoding. This package contains the libraries, include files and other resources you can use to develop FAME applications. %prep %setup -q %patch0 -p0 -b .aclocal18 %patch1 -p0 -b .config-rpath %patch2 -p1 -b .gccver %patch3 -p1 -b .nomarch %patch4 -p1 -b .mmxone %patch5 -p1 -b .fstrict-aliasing %patch6 -p1 -b .x86_64 # This is required since the included libtool stuff is too old and breaks # linking (-lm and -lc functions not found!) on FC5 x86_64. %{__rm} -f acinclude.m4 aclocal.m4 %{__cp} -f /usr/share/aclocal/libtool.m4 libtool.m4 touch NEWS ChangeLog autoreconf --force --install # Fix lib stuff for lib64 %{__perl} -pi.orig -e 's|/lib"|/%{_lib}"|g' configure.in %build # Note: SSE support does nothing (as of 0.9.1). grep for HAS_SSE. %configure --disable-dependency-tracking \ %ifarch %{ix86} ia64 --enable-mmx %else --disable-mmx %endif make %{?_smp_flags} %install rm -Rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -Rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES COPYING README TODO %{_libdir}/libfame*.so.* %files devel %defattr(-,root,root,-) %exclude %{_libdir}/libfame.la %{_bindir}/libfame-config %{_includedir}/fame*.h %{_libdir}/libfame.a %{_libdir}/libfame.so %{_datadir}/aclocal/libfame.m4 %{_mandir}/man3/fame*.3* %changelog * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.9.1-13 - Merge livna and freshrpms packages for rpmfusion * Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-12 - Update underquoted patch, which stopped applying cleanly for some reason. * Mon Mar 20 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-11 - Remove old libtool/m4 files to fix x86_64 FC5 linking. * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-9 - Release bump to drop the disttag number in FC5 build. * Fri Sep 30 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-8 - Include x86_64 patch from Andy Loening, fixes some segfaults. - Update underquoted patch to also remove warnings at libfame build time. * Sun Jun 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-7 - Make the underquoted patch apply to the .in file too, so it actually works. - Put ldconfig calls back as programs to have rpm's deps pick them up. * Thu May 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-6 - Run plain "./autogen.sh" instead of autoreconf to avoid libm problem on x86_64 (weird one!). - Actually really apply the last patch too... * Sun May 1 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-5 - Patch the m4 file to fix underquoted warning. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libfame/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Aug 2008 15:45:18 -0000 1.1 +++ .cvsignore 3 Sep 2008 15:20:15 -0000 1.2 @@ -0,0 +1 @@ +libfame-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/libfame/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Aug 2008 15:45:18 -0000 1.1 +++ sources 3 Sep 2008 15:20:15 -0000 1.2 @@ -0,0 +1 @@ +880085761e17a3b4fc41f4f6f198fd3b libfame-0.9.1.tar.gz

16 years, 2 months

1
0
0 / 0

rpms/libfame/F-9 libfame-0.9.1-fstrict-aliasing.patch, NONE, 1.1 libfame-0.9.1-gcc34-1.patch, NONE, 1.1 libfame-0.9.1-underquoted.patch, NONE, 1.1 libfame-0.9.1-x86_64.patch, NONE, 1.1 libfame-aclocal18.patch, NONE, 1.1 libfame-config-rpath.patch, NONE, 1.1 libfame-gccver.patch, NONE, 1.1 libfame-nomarch.patch, NONE, 1.1 libfame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/libfame/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv14010 Modified Files: .cvsignore sources Added Files: libfame-0.9.1-fstrict-aliasing.patch libfame-0.9.1-gcc34-1.patch libfame-0.9.1-underquoted.patch libfame-0.9.1-x86_64.patch libfame-aclocal18.patch libfame-config-rpath.patch libfame-gccver.patch libfame-nomarch.patch libfame.spec Log Message: initial import from devel branch libfame-0.9.1-fstrict-aliasing.patch: --- NEW FILE libfame-0.9.1-fstrict-aliasing.patch --- --- libfame-0.9.1.orig/configure.in 2008-08-15 23:50:51.000000000 -0400 +++ libfame-0.9.1/configure.in 2008-08-15 23:55:14.000000000 -0400 @@ -90,26 +90,9 @@ dnl See if we need to pass -lm for the m AC_CHECK_LIB(m, sqrt, LIBS="$LIBS -lm") dnl Optimize +dnl enable -fstrict-aliasing unconditionally if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" - -dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95 - gcc_major_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - gcc_minor_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - gcc_micro_version=`$CC -dumpversion | \ - sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - - dnl ok, I must admit I don't know how to do or/and ;) - if test $gcc_major_version -eq 2; then - if test $gcc_minor_version -gt 94; then - CFLAGS="$CFLAGS -fstrict-aliasing" - fi - fi - if test $gcc_major_version -gt 2; then - CFLAGS="$CFLAGS -fstrict-aliasing" - fi + CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math -fstrict-aliasing" fi dnl Check for debugging support libfame-0.9.1-gcc34-1.patch: --- NEW FILE libfame-0.9.1-gcc34-1.patch --- Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> Date: 2004-09-04 Initial Package Version: 0.9.1 Upstream Status: Not submitted Origin: Randy McMurchy Description: Fixes libfame library when compiled with GCC-3.4.x $LastChangedBy: randy $ $Date: 2004-09-05 00:11:51 -0600 (Sun, 05 Sep 2004) $ diff -Naur libfame-0.9.1-orig/src/half_mmx.h libfame-0.9.1/src/half_mmx.h --- libfame-0.9.1-orig/src/half_mmx.h 2002-04-30 18:04:02.000000000 +0000 +++ libfame-0.9.1/src/half_mmx.h 2004-09-05 03:49:09.666845896 +0000 @@ -18,7 +18,7 @@ */ /**************************** half-pixel interpolation ***********************/ -static short const _mmx_one[] = { 1, 1, 1, 1 }; +const _mmx_one[] = { 1, 1, 1, 1 }; static void inline mmx_interpolate(unsigned char **ref, int pitch, diff -Naur libfame-0.9.1-orig/src/half_sse.h libfame-0.9.1/src/half_sse.h --- libfame-0.9.1-orig/src/half_sse.h 2002-01-27 02:24:56.000000000 +0000 +++ libfame-0.9.1/src/half_sse.h 2004-09-05 03:49:39.894250632 +0000 @@ -19,7 +19,7 @@ */ /**************************** half-pixel interpolation ***********************/ -static short const _mmx_one[] = { 1, 1, 1, 1 }; +const _mmx_one[] = { 1, 1, 1, 1 }; static unsigned char const _mmx_one_byte[] = {1,1,1,1,1,1,1,1}; libfame-0.9.1-underquoted.patch: --- NEW FILE libfame-0.9.1-underquoted.patch --- diff -Naupr libfame-0.9.1.orig/libfame.m4.in libfame-0.9.1/libfame.m4.in --- libfame-0.9.1.orig/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100 +++ libfame-0.9.1/libfame.m4.in 2006-09-18 20:38:20.000000000 +0200 @@ -3,7 +3,7 @@ dnl Test for libfame, and define LIBFAME dnl Vivien Chappelier 12/11/00 dnl stolen from ORBit autoconf dnl -AC_DEFUN(AM_PATH_LIBFAME, +AC_DEFUN([AM_PATH_LIBFAME], [dnl dnl Get the cflags and libraries from the libfame-config script dnl libfame-0.9.1-x86_64.patch: --- NEW FILE libfame-0.9.1-x86_64.patch --- diff -Naupr libfame-0.9.1.orig/src/fame_malloc.c libfame-0.9.1/src/fame_malloc.c --- libfame-0.9.1.orig/src/fame_malloc.c 2003-06-20 14:40:30.000000000 +0200 +++ libfame-0.9.1/src/fame_malloc.c 2005-09-30 11:08:48.000000000 +0200 @@ -36,9 +36,9 @@ void* fame_malloc(size_t size) */ ptr = (unsigned char*) malloc(size+ALIGN); - aligned = (unsigned char*) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN ); + aligned = (unsigned char*) (((unsigned long)ptr &(~(ALIGN-1))) + ALIGN ); padding = aligned - 1; - *padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1)); + *padding = (ALIGN-1) - ((unsigned long)ptr & (ALIGN-1)); return ((void*)aligned); } libfame-aclocal18.patch: --- NEW FILE libfame-aclocal18.patch --- --- libfame.m4.in~ 2001-11-20 13:56:37.000000000 +0200 +++ libfame.m4.in 2004-07-17 22:44:13.241838905 +0300 @@ -3,7 +3,7 @@ dnl Vivien Chappelier 12/11/00 dnl stolen from ORBit autoconf dnl -AC_DEFUN(AM_PATH_LIBFAME, +AC_DEFUN([AM_PATH_LIBFAME], [dnl dnl Get the cflags and libraries from the libfame-config script dnl libfame-config-rpath.patch: --- NEW FILE libfame-config-rpath.patch --- --- libfame-config.in~ 2001-06-22 14:10:59.000000000 +0300 +++ libfame-config.in 2004-07-17 22:47:55.867418653 +0300 @@ -48,7 +48,7 @@ if [ "`uname`" = "SunOS" ]; then libdirs="-L@libdir@ -R@libdir@" else - libdirs="-L@libdir@ @FAME_RLD_FLAGS@" + libdirs="-L@libdir@" fi echo $libdirs -lfame ;; libfame-gccver.patch: --- NEW FILE libfame-gccver.patch --- diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in --- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200 +++ libfame-0.9.1/configure.in 2004-07-17 23:26:07.421758515 +0300 @@ -101,11 +101,11 @@ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95 - gcc_major_version=`$CC --version | \ + gcc_major_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - gcc_minor_version=`$CC --version | \ + gcc_minor_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - gcc_micro_version=`$CC --version | \ + gcc_micro_version=`$CC -dumpversion | \ sed -e 's,[[^0-9.]],,g' -e 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` dnl ok, I must admit I don't know how to do or/and ;) diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure --- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200 +++ libfame-0.9.1/configure 2004-07-17 23:26:07.422758205 +0300 @@ -4607,11 +4607,11 @@ if test x$ac_cv_c_compiler_gnu = xyes; then CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math" - gcc_major_version=`$CC --version | \ + gcc_major_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'` - gcc_minor_version=`$CC --version | \ + gcc_minor_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'` - gcc_micro_version=`$CC --version | \ + gcc_micro_version=`$CC -dumpversion | \ sed -e 's,[^0-9.],,g' -e 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'` if test $gcc_major_version -eq 2; then libfame-nomarch.patch: --- NEW FILE libfame-nomarch.patch --- diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure --- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200 +++ libfame-0.9.1/configure 2004-07-18 00:01:13.266432497 +0300 @@ -4505,18 +4505,11 @@ fi ;; i386-*-*) - if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i386" - fi - ;; - i486-*-*) - if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP" - fi + true ;; i?86-*-*) if test x$ac_cv_c_compiler_gnu = xyes; then - CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP" + CFLAGS="$CFLAGS -DHAS_BSWAP" fi ;; esac diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in --- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200 +++ libfame-0.9.1/configure.in 2004-07-18 00:01:01.288132690 +0300 @@ -61,18 +61,11 @@ fi ;; i386-*-*) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i386" - fi - ;; - i486-*-*) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP" - fi + true ;; i?86-*-*) if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP" + CFLAGS="$CFLAGS -DHAS_BSWAP" fi ;; esac --- NEW FILE libfame.spec --- Summary: Fast Assembly MPEG Encoding library Name: libfame Version: 0.9.1 Release: 13%{?dist} License: LGPL Group: System Environment/Libraries Source0: http://download.sourceforge.net/fame/%{name}-%{version}.tar.gz Patch0: %{name}-aclocal18.patch Patch1: %{name}-config-rpath.patch Patch2: %{name}-gccver.patch Patch3: %{name}-nomarch.patch Patch4: http://www.linuxfromscratch.org/blfs/downloads/svn/libfame-0.9.1-gcc34-1.... Patch5: libfame-0.9.1-fstrict-aliasing.patch Patch6: libfame-0.9.1-x86_64.patch URL: http://fame.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, automake, libtool %description FAME is a library for fast MPEG encoding. %package devel Summary: Libraries and include to develop using FAME Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel FAME is a library for fast MPEG encoding. This package contains the libraries, include files and other resources you can use to develop FAME applications. %prep %setup -q %patch0 -p0 -b .aclocal18 %patch1 -p0 -b .config-rpath %patch2 -p1 -b .gccver %patch3 -p1 -b .nomarch %patch4 -p1 -b .mmxone %patch5 -p1 -b .fstrict-aliasing %patch6 -p1 -b .x86_64 # This is required since the included libtool stuff is too old and breaks # linking (-lm and -lc functions not found!) on FC5 x86_64. %{__rm} -f acinclude.m4 aclocal.m4 %{__cp} -f /usr/share/aclocal/libtool.m4 libtool.m4 touch NEWS ChangeLog autoreconf --force --install # Fix lib stuff for lib64 %{__perl} -pi.orig -e 's|/lib"|/%{_lib}"|g' configure.in %build # Note: SSE support does nothing (as of 0.9.1). grep for HAS_SSE. %configure --disable-dependency-tracking \ %ifarch %{ix86} ia64 --enable-mmx %else --disable-mmx %endif make %{?_smp_flags} %install rm -Rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -Rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS BUGS CHANGES COPYING README TODO %{_libdir}/libfame*.so.* %files devel %defattr(-,root,root,-) %exclude %{_libdir}/libfame.la %{_bindir}/libfame-config %{_includedir}/fame*.h %{_libdir}/libfame.a %{_libdir}/libfame.so %{_datadir}/aclocal/libfame.m4 %{_mandir}/man3/fame*.3* %changelog * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.9.1-13 - Merge livna and freshrpms packages for rpmfusion * Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-12 - Update underquoted patch, which stopped applying cleanly for some reason. * Mon Mar 20 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-11 - Remove old libtool/m4 files to fix x86_64 FC5 linking. * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-9 - Release bump to drop the disttag number in FC5 build. * Fri Sep 30 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-8 - Include x86_64 patch from Andy Loening, fixes some segfaults. - Update underquoted patch to also remove warnings at libfame build time. * Sun Jun 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-7 - Make the underquoted patch apply to the .in file too, so it actually works. - Put ldconfig calls back as programs to have rpm's deps pick them up. * Thu May 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-6 - Run plain "./autogen.sh" instead of autoreconf to avoid libm problem on x86_64 (weird one!). - Actually really apply the last patch too... * Sun May 1 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-5 - Patch the m4 file to fix underquoted warning. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libfame/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Aug 2008 15:45:18 -0000 1.1 +++ .cvsignore 3 Sep 2008 15:15:48 -0000 1.2 @@ -0,0 +1 @@ +libfame-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/libfame/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Aug 2008 15:45:18 -0000 1.1 +++ sources 3 Sep 2008 15:15:48 -0000 1.2 @@ -0,0 +1 @@ +880085761e17a3b4fc41f4f6f198fd3b libfame-0.9.1.tar.gz

16 years, 2 months

1
0
0 / 0

rpms/vlc/F-9 vlc-0.8.6i-ffmpeg-compat.patch, NONE, 1.1 vlc.spec, 1.3, 1.4

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13704 Modified Files: vlc.spec Added Files: vlc-0.8.6i-ffmpeg-compat.patch Log Message: fix for i vlc-0.8.6i-ffmpeg-compat.patch: --- NEW FILE vlc-0.8.6i-ffmpeg-compat.patch --- diff -up vlc-0.8.6i/configure.ac.compat vlc-0.8.6i/configure.ac --- vlc-0.8.6i/configure.ac.compat 2008-07-13 14:56:29.000000000 +0200 +++ vlc-0.8.6i/configure.ac 2008-07-13 15:00:53.000000000 +0200 @@ -2714,14 +2714,14 @@ dnl Look for a ffmpeg-config (we are on else dnl Trying with pkg-config - PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], + PKG_CHECK_MODULES(FFMPEG,[libavcodec-compat, libavformat-compat], [ CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" - AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) - AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) - AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h libpostproc/postprocess.h) + AC_CHECK_HEADERS(ffmpeg/avcodec.h avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h avutil.h) + AC_CHECK_HEADERS(postproc/postprocess.h postprocess.h) if test "${SYS}" = "darwin"; then VLC_ADD_BUILTINS([ffmpeg]) else @@ -2737,7 +2737,7 @@ dnl Trying with pkg-config VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) dnl newer ffmpeg have a separate libpostproc - PKG_CHECK_MODULES(POSTPROC, libpostproc,[ + PKG_CHECK_MODULES(POSTPROC, libpostproc-compat,[ VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) ],[ true ]) VLC_RESTORE_FLAGS @@ -2785,8 +2785,8 @@ if test "${enable_ffmpeg}" != "no" then CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}" - AC_CHECK_LIB(avcodec, img_resample, , - [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled])], -lavutil) + AC_CHECK_LIB(avcodec-compat, img_resample, , + [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled])], -lavutil-compat) VLC_RESTORE_FLAGS fi Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/vlc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vlc.spec 9 Aug 2008 18:46:20 -0000 1.3 +++ vlc.spec 3 Sep 2008 15:13:27 -0000 1.4 @@ -7,7 +7,7 @@ %define with_ffmpeg_compat 1 %define ffmpeg_date 20080113 %define with_internal_live555 0 -%define with_shared_live555 0 +%define with_shared_live555 1 %define live555_date 2008.04.03 %define vlc_git 0 %define vlc_date 20080611 @@ -28,8 +28,8 @@ %define _version %{version}-git Release: %{release_tag}.%{vlc_date}git%{?dist} %else -Version: 0.8.6h -%define release_tag 2 +Version: 0.8.6i +%define release_tag 3 %define _version %{version} Release: %{release_tag}%{?dist} %endif @@ -63,9 +63,7 @@ Patch17: vlc-0.8.6c-dts_to_dca_api.patch Patch19: vlc-0.8.6e-pulse.patch Patch20: vlc-0.8.6e-pulse_default.patch -Patch21: vlc-0.8.6e-directfb.patch -Patch50: vlc-0.8.6h-ffmpeg-compat.patch -Patch51: vlc-0.8.6c-ffmpeg_fix_for_compat.patch +Patch50: vlc-0.8.6i-ffmpeg-compat.patch Patch63: vlc-trunk-dirac_0_9_0-api.patch Patch80: vlc-0.8.6e-xulrunner.patch Patch90: vlc-0.8.6-vlvc_0.8.patch @@ -347,12 +345,10 @@ %patch17 -p1 -b .dts_dca %patch19 -p1 -b .pulse %patch20 -p1 -b .pulse_default -%patch21 -p1 -b .directfb %endif %if %{with_ffmpeg_compat} %patch50 -p1 -b .compat -#patch51 -p1 -b .fix_for_compat %endif %if 0%{?fedora} > 8 @@ -460,7 +456,8 @@ # Fake the ffmpeg installation ln -sf %{_includedir}/ffmpeg-compat temp/ffmpeg ln -sf %{_includedir}/postproc-compat temp/postproc -export FFMPEG_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp" +export FFMPEG_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" +export POSTPROC_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" export FFMPEG_LDFLAGS="$(pkg-config --libs libpostproc-compat libavcodec-compat libavutil-compat libavformat-compat)" %endif @@ -690,6 +687,7 @@ %{_libdir}/vlc/video_output/libx11_plugin.so %{_libdir}/vlc/video_output/libxvideo_plugin.so %{_libdir}/vlc/visualization/libgalaktos_plugin.so +%{_libdir}/vlc/audio_output/libpulse_plugin.so %if %vlc_git %{_libdir}/vlc/misc/libxosd_plugin.so %{_libdir}/vlc/codec/libxvmc_plugin.so @@ -723,6 +721,7 @@ %exclude %{_libdir}/vlc/video_output/libx11_plugin.so %exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so %exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so +%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so %if %vlc_git %exclude %{_libdir}/vlc/misc/libxosd_plugin.so %exclude %{_libdir}/vlc/codec/libxvmc_plugin.so @@ -776,8 +775,24 @@ %changelog -* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8.6h-2 -- rebuild +* Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 0.8.6i-3 +- Import for RPMFusion +- Switch for live555 + +* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-2 +- Fix compilation with ffmpeg-compat + +* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-1 +- Update to 0.8.6i +Security updates: + * Fixed integer overflow in WAV demuxer (CVE-2008-2430) + +Various bugfixes: + * Fixed option to use shared memory within the GLX video output module + * Miscellaneous bugfixes in multiple modules and in libvlc + (transcode stream output, OSD menu video filter, VCD input, + SAP services discovery, http control interface) + * Updated Polish translation * Fri Jun 6 2008 kwizart < kwizart at gmail.com > - 0.8.6h-1 - Update to 0.8.6h

16 years, 2 months

1
0
0 / 0

rpms/mythtv/F-8 PACKAGE-LICENSING, NONE, 1.1 mysql.txt, NONE, 1.1 mythbackend.init.in, NONE, 1.1 mythbackend.logrotate.in, NONE, 1.1 mythbackend.sysconfig.in, NONE, 1.1 mythfrontend.desktop, NONE, 1.1 mythplugins-0.21-svnfixes.patch, NONE, 1.1 mythtv-0.20-mythstreammenu.diff, NONE, 1.1 mythtv-0.21-svnfixes.patch, NONE, 1.1 mythtv-setup.desktop, NONE, 1.1 mythtv.spec, NONE, 1.1 mythweb.conf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/mythtv/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12750 Modified Files: .cvsignore sources Added Files: PACKAGE-LICENSING mysql.txt mythbackend.init.in mythbackend.logrotate.in mythbackend.sysconfig.in mythfrontend.desktop mythplugins-0.21-svnfixes.patch mythtv-0.20-mythstreammenu.diff mythtv-0.21-svnfixes.patch mythtv-setup.desktop mythtv.spec mythweb.conf Log Message: initial import from devel branch --- NEW FILE PACKAGE-LICENSING --- The mythtv sources are all distributed under the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version, with the following exceptions: GPLv2 or QPL: ------------- mythtv/libs/libmyth/mythwizard.* LGPLv2: ------- mythtv/libs/libmyth/qmdcodec.* GPLv2+ or LGPLv2+: ---------------- mythtv/libs/libswscale/*.{c,h} LGPLv2+: -------- mythtv/libs/libavcodec/* mythtv/libs/libavformat/* mythtv/libs/libavutil/* mythtv/libs/libmyth/bio2jack.* mythtv/libs/libmythlivemedia/* mythtv/libs/libmythsoundtouch/* --- NEW FILE mysql.txt --- DBHostName=localhost # By default, Myth tries to ping the DB host to see if it exists. # If your DB host or network doesn't accept pings, set this to no: # #DBHostPing=no DBUserName=mythtv DBPassword=mythtv DBName=mythconverg DBType=QMYSQL3 # Set the following if you want to use something other than this # machine's real hostname for identifying settings in the database. # This is useful if your hostname changes often, as otherwise you # will need to reconfigure mythtv (or futz with the DB) every time. # TWO HOSTS MUST NOT USE THE SAME VALUE # #LocalHostName=my-unique-identifier-goes-here # If you want your frontend to be able to wake your MySQL server # using WakeOnLan, have a look at the following settings: # # # The time the frontend waits (in seconds) between reconnect tries. # This should be the rough time your MySQL server needs for startup # #WOLsqlReconnectWaitTime=0 # # # This is the number of retries to wake the MySQL server # until the frontend gives up # #WOLsqlConnectRetry=5 # # # This is the command executed to wake your MySQL server. # #WOLsqlCommand=echo 'WOLsqlServerCommand not set' --- NEW FILE mythbackend.init.in --- #!/bin/bash # # Startup script for mythbackend # # chkconfig: - 86 14 # description: mythbackend. # processname: mythbackend # pidfile: @rundir(a)/mythbackend.pid # config: # Source function library. . @initdir@/functions if [ -f @sysconfigdir@/mythbackend ]; then . @sysconfigdir@/mythbackend fi ## Defaults, override them in @sysconfigdir@/mythbackend : ${MYTHTV_HOME=@sysconfdir@/mythtv} binary=@bindir@/mythbackend prog=mythbackend RETVAL=0 OPTIONS="$OPTIONS --daemon --logfile @logdir(a)/mythtv/$prog.log --pidfile @rundir(a)/$prog.pid" start() { echo -n $"Starting $prog: " touch @rundir(a)/mythbackend.pid; chown mythtv:mythtv @rundir(a)/mythbackend.pid export MYTHCONFDIR="$MYTHTV_HOME" export HOME="$MYTHTV_HOME" daemon $binary $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch @subsysdir@/$prog return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc $binary RETVAL=$? echo [ $RETVAL = 0 ] && rm -f @subsysdir@/$prog @rundir(a)/$prog.pid } # See how we were called. case "$1" in start) start ;; stop) stop ;; reload|restart) stop start ;; status) status $prog ;; *) echo $"Usage: $prog {start|stop|status|restart}" exit 1 esac exit $RETVAL --- NEW FILE mythbackend.logrotate.in --- @logdir(a)/mythtv/mythbackend.log { notifempty missingok compress compresscmd /usr/bin/bzip2 uncompresscmd /usr/bin/bunzip2 compressext .bz2 weekly rotate 4 size 10M postrotate /bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true endscript } --- NEW FILE mythbackend.sysconfig.in --- #MYTHTV_HOME=@sysconfdir@/mythtv #OPTIONS= --- NEW FILE mythfrontend.desktop --- [Desktop Entry] Encoding=UTF-8 Name=mythTV frontend Comment=Record, playback and watch TV. Icon=mythfrontend.png Exec=mythfrontend Terminal=false Type=Application mythplugins-0.21-svnfixes.patch: --- NEW FILE mythplugins-0.21-svnfixes.patch --- Index: mythplugins/mythweb/modules/music/stream.php =================================================================== --- mythplugins/mythweb/modules/music/stream.php (revision 16468) +++ mythplugins/mythweb/modules/music/stream.php (working copy) @@ -76,8 +76,11 @@ $mime = 'audio/mpeg'; break; case 'ogg': - $mine = 'application/ogg'; + $mime = 'application/ogg'; break; + case 'm4a': + $mime = 'audio/mp4a-latm'; + break; default: $mime = 'application/octet-stream'; } Index: mythplugins/mythweb/modules/_shared/lang/German.lang =================================================================== --- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468) +++ mythplugins/mythweb/modules/_shared/lang/German.lang (working copy) @@ -17,6 +17,7 @@ "$1 hrs" $1 Std. "$1 is not responding." + $1 antwortet nicht "$1 KB" $1 kB "$1 MB" @@ -34,6 +35,7 @@ "$1 recordings" $1 Aufnahmen "$1 requests pending." + $1 Anfragen zu bearbeiten "$1 Search" $1 Suche "$1 TB" @@ -41,35 +43,50 @@ "$1 to $2" $1 bis $2 "$1 wasted" + $1 verschwendet "$1 year" "$1 years" + $1 Jahre "%s Song (%s)" + %s Lied (%s) "%s Songs" + %s Lieder "%s Songs (%s)" + %s Lieder (%s) "°C" "°F" "Aborted" + abgebrochen "Aborting" + breche ab "Action" Aktion "Activate" Aktivieren "Active Screens" "Add" + hinzufügen "Add Album to Current Playlist" + zur Wiedergabelsite hinzufügen "Add Mix" + Mix hinzufügen "Add Song to Current Playlist" + Lied hinzufügen "add string" + hinzufügen "Add this Playlist as a Subplaylist" "Add To Active Screens" "Additional Tables" zus. Tabellen "Admin Key" "Advanced" + erweitert "Advanced Options" Erweiterte Optionen "Advanced Search" + Erweiterte Suche "airdate" + Sendezeit "Airdate" Sendezeit "Airtime" @@ -77,11 +94,16 @@ "Album Listing" "Album Tracks" "Albums" + Alben "Albums with songs by %s" + Alben, die %s enthalten "All" + Alles "All Albums" + Alle Alben "All Categories" "All Fields" + Alles "All Genres" "All groups" Alle Gruppen @@ -94,6 +116,7 @@ "ALLOCINETYPE" "An error occured while adding your playlist." "and" + und "Any" Jeder "Any Category" @@ -103,18 +126,23 @@ "Any Program Type" Jeder Programmtyp "Append" + anhängen "Append to Current Playlist" + an Wiedergabeliste anhängen "Are you sure you want to delete the following show?" Diese Aufnahme wirklich löschen? "Are you sure you want to DELETE THIS SAVED PLAYLIST?" "Artist Listing" "Artists" + Künstler "Artists Beginning with %s" + Künstler mit Anfangsbuchstabe %s "ASX Stream" "Audio Bitrate" "Audio for Hearing Impaired" "Audio for Visually Impaired" "Auto Expire" + "Auto-expire recordings" Aufnahmen autom. löschen "Auto-flag commercials" @@ -135,17 +163,25 @@ Backend Status "Backspace" "Begin a New Search" + neue Suche "brightness" Helligkeit "Browse" + Stöbern "Browse = no" "Browse = yes" "Browse all" + Stöbere überall "Browse All Albums" + Stöbere in allen Alben "Browse Music" + Stöbern "Browse the Music Database" + Musikdatenbank durchstöbern "By Artist Beginning With" + Anfangsbuchstabe "By Genre" + Genre "callsign" Kurzname "Cancel" @@ -153,6 +189,7 @@ Aufnahme abbrechen "Cancelled" "Caps Lock" + Feststellt. "Cast" Besetzung "category" @@ -164,8 +201,11 @@ "CC" CC "Chan. Callsign" + Sender-'Callsign' "Chan. Name" + Sendername "Chan. Number" + Sendernummer "Channel" Sender "channel" @@ -175,26 +215,36 @@ "Channel Detail" Details zum Sender "Channel Info" + Senderinformationen "Channels" + Sender "channum" Sender "Check for duplicates in" Nach Wdhgn. suchen in "Childrens Movies" + Kinderfilme "Choose Genre.." "Choose Type" + auswählen [...13611 lines suppressed...] </message> </context> <context> @@ -67,11 +67,11 @@ </message> <message> <source>Set update frequency by using the up/down arrows.Minimum value is 30 Minutes.</source> - <translation type="unfinished"></translation> + <translation>Anna päivitysväli käyttäen nuolinäppäimiä. Pienin arvo on 30 minuuttia.</translation> </message> <message> <source>Press Escape or Menu to exit.</source> - <translation type="unfinished"></translation> + <translation>Paina Escape tai Menu poistuaksesi.</translation> </message> </context> <context> @@ -101,17 +101,18 @@ <name>QObject</name> <message> <source>MythNews</source> - <translation type="unfinished"></translation> + <translation>MythUutiset</translation> </message> <message> <source>Are you sure you want to delete this news site %1</source> - <translation type="unfinished"></translation> + <translation>Poistetaanko varmasti tämä uutislähde +%1</translation> </message> <message> <source>Downloading media...</source> - <translation type="unfinished"></translation> + <translation>Ladataan uutisia...</translation> </message> </context> <context> Index: mythplugins/mythnews/i18n/mythnews_nl.ts =================================================================== --- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468) +++ mythplugins/mythnews/i18n/mythnews_nl.ts (working copy) @@ -1,51 +1,65 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS><TS version="1.1" language="nl"> +<defaultcodec></defaultcodec> <context> <name>MythNews</name> <message> + <location filename="../mythnews/mythnews.cpp" line="516"/> <source>Updated</source> <translation>Ververst</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="523"/> <source>Unknown</source> <translation>Onbekend</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="998"/> <source>Edit Site Details</source> <translation>Bewerk Site Details</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1000"/> <source>Enter Site Details</source> <translation>Geef Site Details</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1016"/> <source>Name:</source> <translation>Naam:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1028"/> <source>URL:</source> <translation>URL:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1039"/> <source>Icon:</source> <translation>Icoon:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1051"/> <source>OK</source> <translation>OK</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1093"/> <source>Cancel</source> <translation>Annuleer</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1090"/> <source>Edit News Site</source> <translation>Bewerk Nieuws Site</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1091"/> <source>Add News Site</source> <translation>Voeg Nieuws Site Toe</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1092"/> <source>Delete News Site</source> <translation>Verwijder Nieuws Site</translation> </message> @@ -53,47 +67,57 @@ <context> <name>MythNewsConfig</name> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="259"/> <source>Press MENU to set the update frequency.</source> <translation>MENU kiezen om verversingsfrequentie aan te passen</translation> </message> <message> + <location filename="" line="7471221"/> <source>Set update frequency by using the up/down arrows. The minimum allowed value is 30 Minutes.</source> <translation type="obsolete">Verversingsfrequentie kiezen met pijltoetsen. De minimumwaarde is 30 minuten.</translation> </message> <message> + <location filename="" line="7471221"/> <source>Press MENU to return to feed selection.</source> <translation type="obsolete">MENU kiezen om terug te keren.</translation> </message> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="308"/> <source>Set update frequency by using the up/down arrows.Minimum value is 30 Minutes.</source> - <translation type="unfinished"></translation> + <translation>Verversingsfrequentie kiezen met pijltoetsen. De minimumwaarde is 30 minuten.</translation> </message> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="313"/> <source>Press Escape or Menu to exit.</source> - <translation type="unfinished"></translation> + <translation>Gebruik escape of menu om af te sluiten.</translation> </message> </context> <context> <name>NewsSite</name> <message> + <location filename="../mythnews/newsengine.cpp" line="217"/> <source>Failed to retrieve news</source> <translation>Kon berichten niet ophalen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="197"/> <source>Retrieve Failed. </source> <translation>Ophalen mislukt. </translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="206"/> <source>No Cached News</source> <translation>Geen nieuws in geheugen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="219"/> <source>Failed to read downloaded file</source> <translation>Ka opgehaalde bestand niet lezen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="225"/> <source>Showing Cached News</source> <translation>Nieuws in geheugen wordt getoond</translation> </message> @@ -101,10 +125,12 @@ <context> <name>QObject</name> <message> + <location filename="../mythnews/mythnews.cpp" line="1134"/> <source>MythNews</source> <translation>MythNieuws</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1136"/> <source>Are you sure you want to delete this news site %1</source> @@ -113,13 +139,15 @@ %1</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="843"/> <source>Downloading media...</source> - <translation type="unfinished"></translation> + <translation>Media aan het downloaden...</translation> </message> </context> <context> <name>ThemeUI</name> <message> + <location filename="themestrings.h" line="2"/> <source>Minutes</source> <translation>Minuten</translation> </message> mythtv-0.20-mythstreammenu.diff: --- NEW FILE mythtv-0.20-mythstreammenu.diff --- --- themes/blue/theme.xml~ 2006-03-27 16:13:40.000000000 +0100 +++ themes/blue/theme.xml 2006-03-27 16:13:40.000000000 +0100 @@ -745,6 +745,11 @@ <image>setup.png</image> <offset>22,10</offset> </buttondef> + + <buttondef name="STREAM"> + <image>stream.png</image> + <offset>60,30</offset> + </buttondef> </myththeme> --- programs/mythfrontend/library.xml~ 2006-03-27 16:12:24.000000000 +0100 +++ programs/mythfrontend/library.xml 2006-03-27 16:12:24.000000000 +0100 @@ -139,5 +139,12 @@ <action>PLUGIN mythgame</action> <depends>mythgame</depends> </button> + + <button> + <type>STREAM</type> + <text>Internet streams</text> + <action>PLUGIN mythstream</action> + <depends>mythstream</depends> + </button> </mythmenu> --- programs/mythfrontend/media_settings.xml~ 2006-03-27 16:13:09.000000000 +0100 +++ programs/mythfrontend/media_settings.xml 2006-03-27 16:13:09.000000000 +0100 @@ -141,4 +141,11 @@ <depends>mythburn</depends> </button> + <button> + <type>STREAM</type> + <text>Stream settings</text> + <action>CONFIGPLUGIN mythstream</action> + <depends>mythstream</depends> + </button> + </mythmenu> mythtv-0.21-svnfixes.patch: --- NEW FILE mythtv-0.21-svnfixes.patch --- Index: mythtv/i18n/mythfrontend_nb.ts =================================================================== --- mythtv/i18n/mythfrontend_nb.ts (revision 16468) +++ mythtv/i18n/mythfrontend_nb.ts (working copy) @@ -151,7 +151,7 @@ </message> <message> <source>Use channel scanner to find channels for this input.</source> - <translation>Bruk kanalsøkeren for å finne kanaler fro denne inndatakilden.</translation> + <translation>Bruk kanalsøkeren for å finne kanaler for denne inndatakilden.</translation> </message> <message> <source>This uses the listings data source to provide the channels for this input.</source> @@ -391,7 +391,7 @@ </message> <message> <source>Anytime on a specific day of the week</source> - <translation>Nårr som helst på en bestemt ukedag</translation> + <translation>Når som helst på en bestemt ukedag</translation> </message> <message> <source>Only on weekdays (Monday through Friday)</source> @@ -1165,7 +1165,7 @@ </message> <message> <source>The connection to the master backend server has gone away for some reason.. Is it running?</source> - <translation>Tilkoblingen til hovedtjeneren har av en eller anenn grunn forsvunnet. Kjører den?</translation> + <translation>Tilkoblingen til hovedtjeneren har av en eller annen grunn forsvunnet. Kjører den?</translation> </message> <message> <source>There are also other clients using this database. They should be shut down first.</source> @@ -1216,7 +1216,7 @@ <source>The theme you are using is missing the 'file_browser_background' element. Returning to the previous menu.</source> - <translation>Temaet som brukes mangler elementet «file_borwsser_background». + <translation>Temaet som brukes mangler elementet «file_browser_background». Går tilbake til forrige meny.</translation> </message> @@ -1224,7 +1224,7 @@ <source>The theme you are using is missing the 'file_browser' element. Returning to the previous menu.</source> - <translation>Temaet som brukes mangler elementet «file_borwser». + <translation>Temaet som brukes mangler elementet «file_browser». Går tilbake til forrige meny.</translation> </message> @@ -1559,7 +1559,7 @@ </message> <message> <source>Commercials are flagged</source> - <translation>Reklamer blir markert</translation> + <translation>Reklamer er markert</translation> </message> <message> <source>An editing cutlist is present</source> @@ -1949,7 +1949,7 @@ </message> <message> <source>Reverse Time</source> - <translation>Omvendt kronoligisk rekkefølge</translation> + <translation>Omvendt kronologisk rekkefølge</translation> </message> <message> <source>Sort by Title</source> @@ -2388,7 +2388,7 @@ </message> <message> <source>If this frontend's host name changes often, check this box and provide a network-unique name to identify it. If unchecked, the frontend machine's local host name will be used to save preferences in the database.</source> - <translation>Hvis klientens vertsnavn enders ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> + <translation>Hvis klientens vertsnavn endres ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> </message> <message> <source>Custom identifier</source> @@ -3163,7 +3163,7 @@ </message> <message> <source>This showing will be recorded.</source> - <translation>Denne sendingen vil bil tatt opp.</translation> + <translation>Denne sendingen vil bli tatt opp.</translation> </message> <message> <source>This showing is being recorded.</source> @@ -3183,7 +3183,7 @@ </message> <message> <source>This showing was not recorded because </source> - <translation>Denne sendingen vil ikke bli tatt opp fordi </translation> + <translation>Denne sendingen ble ikke tatt opp fordi </translation> </message> <message> <source>it was manually set to not record.</source> @@ -3818,7 +3818,7 @@ </message> <message> <source>Match duplicates using subtitle</source> - <translation>Finn duplisering ved hejlp av undertittel</translation> + <translation>Finn duplisering ved hjelp av undertittel</translation> </message> <message> <source>Match duplicates using description</source> @@ -3850,7 +3850,7 @@ </message> <message> <source>Allow auto expire</source> - <translation>Tillatt automatisk utløing</translation> + <translation>Tillat automatisk utløping</translation> </message> <message> <source>Don't allow auto expire</source> @@ -3866,11 +3866,11 @@ </message> <message> <source>Delete oldest if this would exceed the max episodes</source> - <translation>Slett den eldste hvis denne overstiger tillate episoder</translation> + <translation>Slett den eldste hvis denne overstiger antall tillatte episoder</translation> </message> <message> <source>Don't record if this would exceed the max episodes</source> - <translation>Ikke ta opp hvis denne overstiger tillate episoder</translation> + <translation>Ikke ta opp hvis denne overstiger antall tillatte episoder</translation> </message> <message> <source>No episode limit</source> @@ -3956,7 +3956,7 @@ <source>You MUST run 'mythfilldatabase --manual the first time, instead of just 'mythfilldatabase'. Your grabber does not provide channel numbers, so you have to set them manually.</source> - <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnumbre, så disse må angis manuelt.</translation> + <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnummer, så disse må angis manuelt.</translation> </message> <message> <source>Video source setup</source> @@ -4242,7 +4242,7 @@ </message> <message> <source>Enable this setting if MythTV is playing "crackly" audio and you are using hardware encoding. This setting will have no effect on MPEG-4 or RTJPEG video. MythTV will keep extra audio data in its internal buffers to workaround this bug.</source> - <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholde ekstra lyddata i dets interne hurtigminne.</translation> + <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholder ekstra lyddata i dets interne hurtigminne.</translation> </message> <message> <source>PIP Video Location</source> @@ -4410,7 +4410,7 @@ </message> <message> <source>New Recording Free Disk Space Threshold (in Megabytes)</source> - <translation>MInimum ledig diskplass for å ta opp (i MB)</translation> + <translation type="unfinished">Minimum ledig diskplass for å ta opp (i MB)</translation> </message> <message> <source>MythTV will stop scheduling new recordings on a backend when its free disk space falls below this value.</source> @@ -4418,7 +4418,7 @@ </message> <message> <source>Time to record before start of show (in seconds)</source> - <translation>TId å ta opp før programstart (i sekunder)</translation> + <translation type="unfinished">Tid å ta opp før programstart (i sekunder)</translation> </message> <message> <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> @@ -4430,7 +4430,7 @@ </message> <message> <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> - <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planlaggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> + <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planleggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> </message> <message> <source>List Newest Recording First</source> @@ -4470,7 +4470,7 @@ </message> <message> <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can't be decreased further.</source> - <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodues bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodues hvis farten ikke kan reduseres mer.</translation> + <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodus bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodus hvis farten ikke kan reduseres mer.</translation> </message> <message> <source>Menu theme</source> @@ -4578,7 +4578,7 @@ </message> <message> <source>UDP Notify Port</source> - <translation>UPD-notifiseringsport</translation> + <translation>UDP-notifiseringsport</translation> </message> <message> <source>During playback, MythTV will listen for connections from the "mythtvosd" or "mythudprelay" programs on this port. See the README in contrib/mythnotify/ for additional information.</source> @@ -4662,7 +4662,7 @@ </message> <message> <source>"Fill" is the quickest shading method. "Image" is somewhat slow, but has a higher visual quality. No shading will be the fastest.</source> - <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere men ser bedre ut. Ingen skyggelegging er raskest.</translation> + <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere, men ser bedre ut. Ingen skyggelegging er raskest.</translation> </message> <message> <source>System Exit key</source> @@ -4690,7 +4690,7 @@ [...28852 lines suppressed...] +:: Script to run mythbackend through gdb (easily?) +:: There is likely a more efficient way of doing this, +:: but we have to start somewhere. +:: +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: This script is used for gathering backtraces using gdb +Echo COMMENTS: See: http://www.mythtv.org/docs/mythtv-HOWTO-22.html#ss22.2 +Echo COMMENTS: See: http://www.mythtv.org/wiki/index.php/Windows_Port +Echo COMMENTS: -------------------------------------- +Echo. +:: +:gdbcommands +:: +:: Check for and Create if needed the .\gdbcommands.txt +:: +:: syntax taken from [ http://www.mythtv.org/docs/mythtv-HOWTO.html#toc22.2 ] +:: +if not exist ./gdbcommands.txt ( + echo handle SIGPIPE nostop noprint > .\gdbcommands.txt + echo handle SIG33 nostop noprint >> .\gdbcommands.txt + echo set logging on >> .\gdbcommands.txt + echo set pagination off >> .\gdbcommands.txt + echo set args -l myth.log --noupnp --nosched --nojobqueue --nohousekeeper --noautoexpire -v all >> .\gdbcommands.txt + echo run >> .\gdbcommands.txt + echo thread apply all bt full >> .\gdbcommands.txt + echo set logging off >> .\gdbcommands.txt ) +@Echo off + +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: Clearing old gdb.txt before running gdb again. +Echo COMMENTS: -------------------------------------- +Echo. +:: +:: add current data/time to gdb.txt +:: will this be a bad idea? who knows? =) +:: +date /t > .\gdb.txt +time /t >> .\gdb.txt + +:gdb +:: +:: gdb should be in the path. +:: +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: If you need to add any switches to mythbackend edit gdbcommands.txt +Echo COMMENTS: see: "mythbackend.exe --help" for options +Echo COMMENTS: -------------------------------------- +Echo. +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: Starting: gdb +Echo COMMENTS: -------------------------------------- +gdb .\mythbackend.exe -x .\gdbcommands.txt + +Echo. +Echo The backtrace can be found in .\gdb.txt +Echo. Index: mythtv/contrib/Win32/win32-packager.pl =================================================================== --- mythtv/contrib/Win32/win32-packager.pl (revision 16468) +++ mythtv/contrib/Win32/win32-packager.pl (working copy) @@ -68,11 +68,13 @@ # it has NOT been tested much, and will with HIGH PROBABILITY fail somewhere. # TODO - Only $mingw is tested and most likely is safe to change. -# perl compatible paths (single forward slashes in DOS style): -my $msys = 'C:/MSys/1.0/'; # must end in slash, and use forward slashes / -my $sources = 'C:/msys/1.0/sources/'; # must end in slash, and use forward slashes / -my $mingw = 'C:/MinGW/'; # must end in slash, and use forward slashes / -my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives so c:/mythtv/mythtv/ is the main codebase. # must end in slash, and use forward slashes / +# Perl compatible paths. DOS style, but forward slashes, and must end in slash: +my $msys = 'C:/MSys/1.0/'; +my $sources = 'C:/msys/1.0/sources/'; +my $mingw = 'C:/MinGW/'; +my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives + # so c:/mythtv/mythtv/ is the main codebase. +my $build = 'C:/mythtv/build/'; # where 'make install' installs into # DOS executable CMD.exe versions of the paths (for when we shell to DOS mode): my $dosmsys = perl2dos($msys); @@ -80,11 +82,17 @@ my $dosmingw = perl2dos($mingw); my $dosmythtv = perl2dos($mythtv); -# unix/msys equivalent versions of the paths (for when we shell to MSYS/UNIX mode): -my $unixmsys = '/'; # msys root is always mounted here, irrespective of where DOS says it really is. -my $unixmingw = '/mingw/'; # mingw is always mounted here under unix, if you setup mingw right in msys, so we will usually just say /mingw in the code, not '.$unixmingw.' or similar (see /etc/fstab) -my $unixsources = perl2unix($sources); $unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / +# Unix/MSys equiv. versions of the paths (for when we shell to MSYS/UNIX mode): +my $unixmsys = '/'; # MSys root is always mounted here, + # irrespective of where DOS says it really is. +my $unixmingw = '/mingw/'; # MinGW is always mounted here under unix, + # if you setup mingw right in msys, + # so we will usually just say /mingw in the code, + # not '.$unixmingw.' or similar (see /etc/fstab) +my $unixsources = perl2unix($sources); +$unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / my $unixmythtv = perl2unix($mythtv); +my $unixbuild = perl2unix($build); #NOTE: ITS IMPORTANT that the PATHS use the correct SLASH-ing method for the type of action: @@ -520,7 +528,16 @@ [ grep => ['Makefile|MAKEFILE',$mythtv.'mythtv/Makefile'], shell => ['rm '.$unixmythtv.'mythtv/Makefile','nocheck'], comment => 'broken Makefile, delete it' ], # configure -[ file => $mythtv.'mythtv/Makefile', shell => ['source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','./configure --prefix=/usr --disable-dbox2 --disable-hdhomerun --disable-dvb --disable-ivtv --disable-iptv --disable-joystick-menu --disable-xvmc-vld --disable-x11 --disable-xvmc --enable-directx --enable-memalign-hack --cpu=k8 --compile-type=debug'], comment => 'do we already have a Makefile for mythtv?' ], +[ file => $mythtv.'mythtv/Makefile', + shell => ['source '.$unixmythtv.'qt_env.sh', + 'cd '.$unixmythtv.'mythtv', + './configure --prefix='.$unixbuild.' --runtime-prefix=..'. + ' --disable-dbox2 --disable-hdhomerun'. + ' --disable-dvb --disable-ivtv --disable-iptv'. + ' --disable-joystick-menu --disable-xvmc-vld --disable-x11'. + ' --disable-xvmc --enable-directx'. + ' --enable-memalign-hack --cpu=k8 --compile-type=debug'], +comment => 'do we already have a Makefile for mythtv?' ], # make [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], Index: mythtv/contrib/OSX/osx-packager.pl =================================================================== --- mythtv/contrib/OSX/osx-packager.pl (revision 16468) +++ mythtv/contrib/OSX/osx-packager.pl (working copy) @@ -577,6 +577,7 @@ 'mythtv' => [ '--prefix=' . $PREFIX, + '--runtime-prefix=../Resources', # To "cross compile" something for a lesser Mac: #'--tune=G3', #'--disable-altivec', @@ -1041,6 +1042,13 @@ if ( $OPT{'verbose'} ) { push @bundler, '--verbose' } +### Framework that has a screwed up link dependency path +my $AVCfw = '/Developer/FireWireSDK*/Examples/' . + 'Framework/AVCVideoServices.framework'; +my @AVCfw = split / /, `ls -d $AVCfw`; +my $AVCfw = pop @AVCfw; +chop $AVCfw; + ### Create each package. ### Note that this is a bit of a waste of disk space, ### because there are now multiple copies of each library. @@ -1072,6 +1080,9 @@ # Remove copy of binary unlink "$SCRIPTDIR/$target" or die; + if ( $AVCfw ) + { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") } + if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ ) { my $res = "$finalTarget/Contents/Resources"; Index: mythtv/contrib/channel_changers/6200ch.c =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468) +++ mythtv/contrib/channel_changers/6200ch.c (working copy) @@ -76,13 +76,14 @@ #define DCT6416_VENDOR_ID2 0x00001a66 #define DCT6416_MODEL_ID1 0x0000646b -#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19) /* uses a reserved subunit type */ +#define PACE_VENDOR_ID1 0x00005094 /* 550 & 779 */ +#define PACE550_MODEL_ID1 0x00010551 +#define PACE779_MODEL_ID1 0x00010755 -#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */ #define AVC1394_6200_OPERAND_SET 0x20 /* 6200 subunit command operand */ -#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \ - AVC1394_SUBUNIT_ID_0 | AVC1394_6200_COMMAND_CHANNEL | \ +#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_PANEL | \ + AVC1394_SUBUNIT_ID_0 | AVC1394_PANEL_COMMAND_PASS_THROUGH | \ AVC1394_6200_OPERAND_SET #define STARTING_NODE 1 /* skip 1394 nodes to avoid error msgs */ @@ -240,7 +241,8 @@ (dir.vendor_id == DCT6412_VENDOR_ID1) || (dir.vendor_id == DCT6412_VENDOR_ID2) || (dir.vendor_id == DCT6416_VENDOR_ID1) || - (dir.vendor_id == DCT6416_VENDOR_ID2)) && + (dir.vendor_id == DCT6416_VENDOR_ID2) || + (dir.vendor_id == PACE_VENDOR_ID1)) && ((dir.model_id == DCH3200_MODEL_ID1) || (dir.model_id == DCT3412_MODEL_ID1) || (dir.model_id == DCT3416_MODEL_ID1) || @@ -250,7 +252,10 @@ (dir.model_id == DCT6200_MODEL_ID2) || (dir.model_id == DCT6412_MODEL_ID1) || (dir.model_id == DCT6412_MODEL_ID2) || - (dir.model_id == DCT6416_MODEL_ID1)) ) { + (dir.model_id == DCT6416_MODEL_ID1) || + (dir.model_id == PACE550_MODEL_ID1) || + (dir.model_id == PACE779_MODEL_ID1)) ) + { if (dir.unit_spec_id != DCT6200_SPEC_ID) fprintf(stderr, "Warning: Unit Spec ID different.\n"); if (dir.unit_sw_version != DCT6200_SW_VERSION) --- NEW FILE mythtv-setup.desktop --- [Desktop Entry] Encoding=UTF-8 Name=mythTV setup Comment=Setup for mythTV. Icon=mythtv-setup.png Exec=mythtv-setup Terminal=false Type=Application --- NEW FILE mythtv.spec --- # svn revision number %define _svnver r18161 %define branch release-0-21-fixes # Nb: base 0.21 svn rev is r16468 #define branch trunk # disabled options %define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} %define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0} %define with_festival %{?_with_festival: 1} %{?!_with_festival: 0} %define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} %define desktop_applications mythfrontend mythtv-setup %define desktop_vendor RPMFusion %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} Summary: A digital video recorder (DVR) application Name: mythtv Version: 0.21 %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else Release: 8%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of # projects... For a breakdown of the licensing, see PACKAGE-LICENSING. License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+) Group: Applications/Multimedia Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in Source103: mythbackend.logrotate.in Source106: mythfrontend.png Source107: mythfrontend.desktop Source108: mythtv-setup.png Source109: mythtv-setup.desktop Source110: mysql.txt Source401: mythweb.conf # Patches Patch100: mythtv-0.21-svnfixes.patch Patch101: mythtv-0.20-mythstreammenu.diff #Patch102: mythtv-0.21-fedora-settings.patch Patch200: mythplugins-0.21-svnfixes.patch #Patch201: mythplugins-0.21-fedora-settings.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: freetype-devel >= 2 BuildRequires: qt3-devel, mysql-devel >= 5 # Audio framework support BuildRequires: alsa-lib-devel, arts-devel BuildRequires: jack-audio-connection-kit-devel # Need dvb headers to build in dvb support BuildRequires: kernel-headers # Remote control support BuildRequires: lirc-devel # X, Xv, and XvMC video support BuildRequires: libXxf86vm-devel, libXmu-devel BuildRequires: libXvMC-devel, libXv-devel BuildRequires: xorg-x11-proto-devel %ifarch %{ix86} x86_64 BuildRequires: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel %endif %if %with_xvmcnvidia BuildRequires: xorg-x11-drv-nvidia-devel %endif # OpenGL video output and vsync support BuildRequires: libGL-devel, libGLU-devel # DirectFB (disabled by default) %if %with_directfb BuildRequires: directfb-devel %endif # FireWire cable box support BuildRequires: libiec61883-devel, libraw1394-devel, libavc1394-devel # BuildRequires: desktop-file-utils BuildRequires: lm_sensors-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(DBD::mysql), perl(Date::Manip), perl(HTTP::Request) BuildRequires: perl(LWP::UserAgent) BuildRequires: python-devel # Misc A/V format support BuildRequires: lame-devel BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel BuildRequires: faad2-devel BuildRequires: faac-devel BuildRequires: x264-devel BuildRequires: xvidcore-devel BuildRequires: a52dec-devel BuildRequires: libdca-devel BuildRequires: gsm-devel # mythmusic BuildRequires: libmad-devel, taglib-devel >= 1.4 BuildRequires: libvorbis-devel >= 1.0, flac-devel >= 1.0.4 BuildRequires: libcdaudio-devel >= 0.99.6, cdparanoia-devel BuildRequires: fftw2-devel >= 2.1.3, fftw2-devel < 3 BuildRequires: lame-devel BuildRequires: libGL-devel BuildRequires: SDL-devel BuildRequires: faad2-devel BuildRequires: libvisual-devel # mythgallery BuildRequires: libtiff-devel BuildRequires: libexif-devel >= 0.6.9 # mythgame BuildRequires: zlib-devel # mythvideo (nb: mythdvd and mythvideo merged) BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel >= 0.9.4, nasm BuildRequires: mjpegtools-devel >= 1.6.1, xvidcore-devel >= 0.9.1 BuildRequires: libfame-devel >= 0.9.0 BuildRequires: transcode >= 0.6.8 #BuildRequires: libdvdcss-devel >= 1.2.7 # mythbrowser BuildRequires: kdelibs3-devel # mythphone %if 0%{?fedora} >= 9 BuildRequires: ncurses-devel %else BuildRequires: libtermcap-devel %endif %if %with_festival BuildRequires: festival-devel %endif # # Requirements for the mythtv meta-package Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-frontend = %{version}-%{release} Requires: mythtv-setup = %{version}-%{release} Requires: mythplugins = %{version}-%{release} Requires: mythtv-base-themes = %{version}-%{release} Requires: mythtv-themes = %{version} Requires: mythtv-docs Requires: perl-MythTV, python-MythTV Requires: mysql-server, mysql # Not yet packaged for rpmfusion #Requires: xmltv Requires: wget >= 1.9.1 # faad2-devel.ppc64 no available, so: ExcludeArch: ppc64 %define mythfeapiver %(echo %{version} | awk -F. '{print $1 "." $2}') %description MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. There are also several add-ons and themes available. In order to faciliate installations with smart/apt-get/yum and other related package resolvers this meta-package can be used to install all in one sweep. MythTV implements the following PVR features, and more, with a unified graphical interface: - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV. - Video compression using RTjpeg or MPEG-4 - Program listing retrieval using XMLTV - Themable, semi-transparent on-screen display - Electronic program guide - Scheduled recording of TV programs - Resolution of conflicts between scheduled recordings - Basic video editing %package docs Summary: MythTV documentation Group: Documentation %description docs The MythTV documentation, contrib files, database initialization file and miscellaneous other bits and pieces. %package -n libmyth Summary: Library providing mythtv support Group: System Environment/Libraries Requires: lame, qt3 Requires: qt3-MySQL %description -n libmyth Common library code for MythTV and add-on modules (development) MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. %package -n libmyth-devel Summary: Development files for libmyth Group: Development/Libraries Requires: libmyth = %{version}-%{release} Requires: freetype-devel >= 2, lame-devel, qt3-devel, Requires: mysql-devel Requires: alsa-lib-devel, arts-devel Requires: libGL-devel, libGLU-devel Requires: kernel-headers Requires: lirc-devel Requires: xorg-x11-proto-devel Requires: libXxf86vm-devel, libXmu-devel Requires: libXvMC-devel, libXv-devel Requires: libGL-devel, libGLU-devel Requires: libiec61883-devel, libraw1394-devel, libavc1394-devel Requires: alsa-lib-devel, arts-devel Requires: jack-audio-connection-kit-devel %if %with_directfb Requires: directfb-devel %endif %description -n libmyth-devel This package contains the header files and libraries for developing add-ons for mythtv. %package base-themes Summary: Core user interface themes for mythtv Group: Applications/Multimedia %description base-themes MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv-docs package for more information. This package contains the base themes for the mythtv user interface. %package frontend Summary: Client component of mythtv (a PVR) Group: Applications/Multimedia Requires: freetype, lame Requires: mythtv-common = %{version}-%{release} Requires: mythtv-base-themes = %{version} Provides: mythtv-frontend-api = %{mythfeapiver} %description frontend MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the client software, which provides a front-end for playback and configuration. It requires access to a mythtv-backend installation, either on the same system or one reachable via the network. %package backend Summary: Server component of mythtv (a PVR) Group: Applications/Multimedia Requires: lame Requires: mythtv-common = %{version}-%{release} Conflicts: xmltv-grabbers < 0.5.37 %description backend MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the server software, which provides video and audio capture and encoding services. In order to be useful, it requires a mythtv-frontend installation, either on the same system or one reachable via the network. %package setup Summary: Setup the mythtv backend Group: Applications/Multimedia Requires: freetype Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-base-themes = %{version} %description setup MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the setup software for configuring the mythtv backend. %package common Summary: Common components needed by multiple other MythTV components Group: Applications/Multimedia %description common MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains components needed by multiple other MythTV components. %package -n mythplugins Summary: Main MythTV plugins Group: Applications/Multimedia Requires: mythmusic = %{version}-%{release}, mythvideo = %{version}-%{release} Requires: mythweather = %{version}-%{release}, mythgallery = %{version}-%{release} Requires: mythgame = %{version}-%{release}, mythnews = %{version}-%{release} Requires: mythbrowser = %{version}-%{release}, mythphone = %{version}-%{release} Requires: mythcontrols = %{version}-%{release}, mythflix = %{version}-%{release} Requires: mytharchive = %{version}-%{release}, mythzoneminder = %{version}-%{release} Requires: mythmovies = %{version}-%{release} Requires: mythweb = %{version}-%{release} %description -n mythplugins This is a consolidation of all the official MythTV plugins that used to be distributed as separate downloads from mythtv.org. %package -n mythmovies Summary: A module for MythTV for providing local show times and cinema listings Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythmovies MythZoneMinder is a plugin to provide show times and cinema listings based on Zip/Post code and a given radius. It uses external scripts to grab times and so can be used in any country so long as a script is written for a local data source. It ships with a grabber for the USA which uses the ignyte website. %package -n mythmusic Summary: The music player add-on module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythmusic Music add-on for mythtv. %package -n mythvideo Summary: A generic video player frontend module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} Requires: mplayer Requires: transcode >= 0.6.8 Provides: mythdvd = %{version}-%{release} Obsoletes: mythdvd < %{version}-%{release} %description -n mythvideo MythVideo is a MythTV module that allows you to play videos, DVDs and (optionally) VCDs. It can also be configured to let you rip DVDs and transcode their video and audio content to other (generally smaller) formats. The player can either use the MythTV internal software (which now supports DVD menus), or simply to invoke your favorite DVD/XVCD playing software (mplayer, ogle, xine, etc) as an external command. The transcoding is based on and derived from the excellent transcode package. %package -n mythweather Summary: A MythTV module that displays a weather forcast Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythweather A MythTV module that displays a weather forcast. %package -n mythgallery Summary: A gallery/slideshow module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythgallery A gallery/slideshow module for MythTV. %package -n mythgame Summary: A game frontend (xmame, nes, snes, pc) for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythgame A game frontend (xmame, nes, snes, pc) for MythTV. %package -n mythgame-emulators Summary: Meta-package requiring emulators for game types mythgame knows about Group: Applications/Multimedia Requires: mythgame = %{version}-%{release} # Multi Arcade Machine Emulator, Amiga, Atari 2600 Requires: sdlmame, e-uae, stella # Nintendo, Super Nintendo, Nintendo 64 Requires: fceultra, zsnes, mupen64, mupen64-ricevideo # Sega Genesis, Sega Master System, Game Gear Requires: gens, dega-sdl, osmose # TurboGraphx 16 (and others) Requires: mednafen %description -n mythgame-emulators Meta-package requiring emulators for game types mythgame knows about. %package -n mythnews Summary: An RSS news feed plugin for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythnews An RSS news feed reader plugin for MythTV. %package -n mythbrowser Summary: A small web browser module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythbrowser MythBrowser is a full fledged web-browser (multiple tabs) to display webpages in full-screen mode. Simple page navigation is possible. Starting with version 0.13 it also has full support for mouse driven navigation (right mouse opens and clos es the popup menu). MythBrowser also contains a BookmarkManager to manage the website links in a simple mythplugin. %package -n mythphone Summary: A video conferencing module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythphone Mythphone is a phone and videophone capability on MYTH using the standard SIP protocol. It is compatible with Microsoft XP Messenger and with SIP Service Providers such as Free World Dialup (fwd.pulver.com). %package -n mythcontrols Summary: A key bindings editor for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythcontrols MythControls is a key bindings editor for MythTV. %package -n mythflix Summary: A NetFlix module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythflix MythFlix is a NetFlix queue manager for MythTV. %package -n mytharchive Summary: A module for MythTV for creating and burning DVDs Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} Requires: python >= 2.3, MySQL-python, python-imaging Requires: mjpegtools >= 1.6.2, dvdauthor >= 0.6.11 Requires: ffmpeg >= 0.4.9, dvd+rw-tools >= 5.21.4.10.8 Requires: cdrecord >= 2.01, mkisofs >= 2.01 Requires: transcode >= 1.0.2 %description -n mytharchive MythArchive is a new plugin for MythTV that lets you create DVDs from your recorded shows, MythVideo files and any video files available on your system. %package -n mythzoneminder Summary: A module for MythTV for camera security and surveillance Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythzoneminder MythZoneMinder is a plugin to interface to some of the features of ZoneMinder. You can use it to view a status window similar to the console window in ZM. Also there are screens to view live camera shots and replay recorded events. %package -n mythweb Summary: The web interface to MythTV Group: Applications/Multimedia Requires: httpd >= 1.3.26, php >= 4.2.2, php-mysql >= 4.2.2 %description -n mythweb The web interface to MythTV. %package -n perl-MythTV Summary: MythTV perl bindings Group: System Environment/Libraries %description -n perl-MythTV MythTV perl bindings. %package -n python-MythTV Summary: MythTV python bindings Group: System Environment/Libraries Requires: MySQL-python %description -n python-MythTV MythTV python bindings. %prep %setup -q -c -a 1 cd mythtv-%{version} %patch100 -p1 -b .svnfixes #patch101 -p0 -b .mythstreammenu #patch102 -p1 -b .settings # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; # Nuke Windows and Mac OS X build scripts rm -rf contrib/Win32 contrib/OSX # Put perl bits in the right place and set opt flags sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \ bindings/perl/perl.pro cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} . for file in mythbackend.init \ mythbackend.sysconfig \ mythbackend.logrotate; do sed -e's|@logdir@|%{_localstatedir}/log|g' \ -e's|@rundir@|%{_localstatedir}/run|g' \ -e's|@sysconfdir@|%{_sysconfdir}|g' \ -e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \ -e's|@initdir(a)|%{_sysconfdir}/init.d|g' \ -e's|@bindir@|%{_bindir}|g' \ -e's|@sbindir@|%{_sbindir}|g' \ -e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \ -e's|@varlibdir@|%{_localstatedir}/lib|g' \ -e's|@varcachedir@|%{_localstatedir}/cache|g' \ -e's|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g' \ < $file.in > $file done cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} . cd .. temp=`pwd`/temp cd mythplugins-%{version} %patch200 -p1 -b .svnfixes #patch201 -p1 -b .settings mv mytharchive/mythburn/themes/Simple\ -\ Autoplay \ mytharchive/mythburn/themes/Simple_-_Autoplay mv mytharchive/mythburn/themes/MythCenter\ -\ Autoplay \ mytharchive/mythburn/themes/MythCenter_-_Autoplay find . -name \*.pro |\ xargs perl -pi -e's,\$\${PREFIX}/include/mythtv,'$temp%{_includedir}/mythtv, cat >> settings.pro << EOF INCLUDEPATH += $temp%{_includedir} LIBS *= -L$temp%{_libdir} EOF cd mythmusic # Fix /mnt/store -> /var/lib/mythmusic perl -pi -e's|/mnt/store/music|%{_localstatedir}/lib/mythmusic|' mythmusic/globalsettings.cpp cd .. cd mythvideo # Fix /mnt/store -> /var/lib/mythmusic perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp cd .. cd mythweb # Fix up permissions chmod -R g-w ./* cd .. echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro cd .. %build cd mythtv-%{version} ./configure \ %if %with_debug --compile-type=debug \ %else --compile-type=release \ %endif --enable-debug \ %ifarch ppc --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \ --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \ %else --extra-cflags="%{optflags} -fomit-frame-pointer" \ --extra-cxxflags="%{optflags} -fomit-frame-pointer" \ %endif %ifarch %{ix86} --cpu=i686 --tune=i686 --enable-mmx \ %endif --prefix=%{_prefix} \ --libdir-name=%{_lib} \ --enable-pthreads --enable-ffmpeg-pthreads \ --enable-joystick-menu \ --enable-lirc \ --enable-ivtv \ --enable-firewire \ --enable-dvb \ --enable-audio-oss --enable-audio-alsa --enable-audio-arts \ --enable-audio-jack \ --enable-xvmc --enable-xvmcw \ %if %with_xvmcnvidia --xvmc-lib=XvMCNVIDIA_dynamic --enable-xvmc-opengl \ %else %ifarch %{ix86} x86_64 --enable-xvmc-vld --enable-xvmc-pro \ %endif %endif --enable-x11 --x11-path=%{_includedir} \ --enable-xrandr \ --enable-xv \ --enable-opengl-video --enable-opengl-vsync \ %if %with_directfb --enable-directfb \ %else --disable-directfb \ %endif --enable-liba52 --enable-libmp3lame \ --enable-libfaac --enable-libfaad \ --enable-libtheora --enable-libvorbis \ --enable-libx264 --enable-libxvid \ --with-bindings="perl, python" echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro qmake mythtv.pro # Insert rpm version-release for mythbackend --version output find . -name version.pro | xargs perl -pi -e 's|svnversion \$\${SVNTREEDIR}|echo "%{version}-%{release}"|g' make %{?_smp_mflags} cd .. mkdir temp temp=`pwd`/temp make -C mythtv-%{version} install INSTALL_ROOT=$temp export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$temp%{_libdir} cd mythplugins-%{version} ./configure \ --prefix=${temp}%{_prefix} \ --libdir-name=%{_lib} \ --enable-opengl \ --enable-mytharchive \ --enable-create-dvd \ --enable-create-archive \ --enable-mythbrowser \ --enable-mythcontrols \ --enable-mythflix \ --enable-mythgallery \ --enable-exif \ --enable-new-exif \ --enable-mythgame \ --enable-mythmovies \ --enable-mythmusic \ --enable-libvisual \ --enable-fftw \ --enable-sdl \ --enable-aac \ --enable-mythnews \ --enable-mythphone \ %if %with_festival --enable-festival \ %endif --enable-mythvideo \ --enable-mythweather \ --enable-mythzoneminder qmake mythplugins.pro make %{?_smp_mflags} cd .. %install rm -rf %{buildroot} cd mythtv-%{version} make install INSTALL_ROOT=%{buildroot} ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv mkdir -p %{buildroot}%{_localstatedir}/log/mythtv mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/mythtv # Fix permissions on executable python bindings chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth{DB,TV}.py install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/ echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml install -p -m 755 mythbackend.init %{buildroot}%{_sysconfdir}/init.d/mythbackend install -p -m 644 mythbackend.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mythbackend install -p -m 644 mythbackend.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend # Desktop entries mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications for file in %{desktop_applications}; do install -p $file.png %{buildroot}%{_datadir}/pixmaps/$file.png desktop-file-install --vendor %{desktop_vendor} \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora-Extra \ --add-category Application \ --add-category AudioVideo \ $file.desktop done mkdir -p %{buildroot}%{_libdir}/mythtv/plugins mkdir -p %{buildroot}%{_datadir}/mythtv/build/ install -p -m 644 settings.pro %{buildroot}%{_datadir}/mythtv/build/ cd .. cd mythplugins-%{version} make install INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo mkdir -p %{buildroot}%{_localstatedir}/lib/pictures mkdir -p %{buildroot}%{_datadir}/mythtv/games/nes/{roms,screens} mkdir -p %{buildroot}%{_datadir}/mythtv/games/snes/{roms,screens} #mkdir -p %{buildroot}%{_datadir}/mythtv/games/mame/{roms,screens,flyers,cabs} mkdir -p %{buildroot}%{_datadir}/mythtv/games/PC/screens mkdir -p %{buildroot}%{_datadir}/mame ln -s ../../mame %{buildroot}%{_datadir}/mythtv/games/xmame mkdir -p %{buildroot}%{_datadir}/mame/flyers ln -s snap %{buildroot}%{_datadir}/mythtv/games/xmame/screens mkdir -p %{buildroot}%{_sysconfdir}/mythgame cp -a mythgame/gamelist.xml %{buildroot}%{_sysconfdir}/mythgame/ ln -s ../../../../../%{_sysconfdir}/mythgame/ \ %{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml cd mythweb mkdir -p %{buildroot}%{_datadir}/mythweb cp -a * %{buildroot}%{_datadir}/mythweb/ mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions} # fix up permissions chmod -R g-x %{buildroot}%{_datadir}/mythweb mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/ # drop .htaccess file, settings handled in the above rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess cd .. cd .. %clean rm -rf %{buildroot} %pre backend # Add the "mythtv" user /usr/sbin/useradd -c "mythtvbackend User" \ -s /sbin/nologin -r -d %{_localstatedir}/lib/mythtv mythtv 2> /dev/null || : %post -n libmyth -p /sbin/ldconfig %postun -n libmyth -p /sbin/ldconfig %post backend /sbin/chkconfig --add mythbackend %preun backend if [ $1 = 0 ]; then /sbin/service mythbackend stop > /dev/null 2>&1 /sbin/chkconfig --del mythbackend fi %files %defattr(-,root,root,-) %files docs %defattr(-,root,root,-) %doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING %doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ %doc mythtv-%{version}/database mythtv-%{version}/keys.txt %doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png %doc mythtv-%{version}/docs/*.txt mythtv-%{version}/contrib %doc mythtv-%{version}/PACKAGE-LICENSING %files common %defattr(-,root,root,-) %dir %{_sysconfdir}/mythtv %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml %{_bindir}/mythcommflag %{_bindir}/mythtranscode %files backend %defattr(-,root,root,-) %{_bindir}/mythbackend %{_bindir}/mythfilldatabase %{_bindir}/mythjobqueue %{_bindir}/mythreplex %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv %attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv %{_sysconfdir}/init.d/mythbackend %config(noreplace) %{_sysconfdir}/sysconfig/mythbackend %config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend %attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv %files setup %defattr(-,root,root,-) %{_bindir}/mythtv-setup %{_bindir}/mythtvsetup %{_datadir}/mythtv/setup.xml %{_datadir}/applications/*mythtv-setup.desktop %files frontend %defattr(-,root,root,-) %{_datadir}/mythtv/devicemaster.xml %{_datadir}/mythtv/deviceslave.xml %{_datadir}/mythtv/CDS_scpd.xml %{_datadir}/mythtv/CMGR_scpd.xml %{_datadir}/mythtv/MSRR_scpd.xml %{_datadir}/mythtv/info_menu.xml %{_datadir}/mythtv/info_settings.xml %{_datadir}/mythtv/library.xml %{_datadir}/mythtv/main_settings.xml %{_datadir}/mythtv/mainmenu.xml %{_datadir}/mythtv/manage_recordings.xml %{_datadir}/mythtv/media_settings.xml %{_datadir}/mythtv/optical_menu.xml %{_datadir}/mythtv/recpriorities_settings.xml %{_datadir}/mythtv/setup.xml %{_datadir}/mythtv/tv_lists.xml %{_datadir}/mythtv/tv_schedule.xml %{_datadir}/mythtv/tv_search.xml %{_datadir}/mythtv/tv_settings.xml %{_datadir}/mythtv/tvmenu.xml %{_datadir}/mythtv/util_menu.xml %{_bindir}/mythfrontend %{_bindir}/mythtv %{_bindir}/mythtvosd %{_bindir}/mythlcdserver %{_bindir}/mythshutdown %{_bindir}/mythwelcome %{_libdir}/mythtv/filters %dir %{_libdir}/mythtv/plugins %{_datadir}/mythtv/*.ttf %dir %{_datadir}/mythtv/i18n %{_datadir}/mythtv/i18n/mythfrontend_*.qm %{_datadir}/applications/*mythfrontend.desktop %{_datadir}/pixmaps/myth*.png %files base-themes %defattr(-,root,root,-) %dir %{_datadir}/mythtv/themes %{_datadir}/mythtv/themes/* %files -n libmyth %defattr(-,root,root,-) %{_libdir}/*.so.* %files -n libmyth-devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %exclude %{_libdir}/*.a %{_datadir}/mythtv/build/settings.pro %files -n mythplugins %defattr(-,root,root,-) %doc mythplugins-%{version}/COPYING %files -n mythmovies %defattr(-,root,root,-) %doc mythplugins-%{version}/mythmovies/COPYING %doc mythplugins-%{version}/mythmovies/README %doc mythplugins-%{version}/mythmovies/TODO %{_bindir}/ignyte %{_datadir}/mythtv/themes/default/movies-ui.xml %{_libdir}/mythtv/plugins/libmythmovies.so %files -n mythmusic %defattr(-,root,root,-) %doc mythplugins-%{version}/mythmusic/AUTHORS %doc mythplugins-%{version}/mythmusic/COPYING %doc mythplugins-%{version}/mythmusic/README %{_libdir}/mythtv/plugins/libmythmusic.so %{_localstatedir}/lib/mythmusic %{_datadir}/mythtv/musicmenu.xml %{_datadir}/mythtv/music_settings.xml %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/i18n/mythmusic_*.qm %files -n mythvideo %defattr(-,root,root,-) %doc mythplugins-%{version}/mythvideo/COPYING %doc mythplugins-%{version}/mythvideo/README* %{_libdir}/mythtv/plugins/libmythvideo.so %{_datadir}/mythtv/mythvideo %{_datadir}/mythtv/i18n/mythvideo_*.qm %{_datadir}/mythtv/video_settings.xml %{_datadir}/mythtv/videomenu.xml %{_localstatedir}/lib/mythvideo %{_bindir}/mtd %files -n mythweather %defattr(-,root,root,-) %doc mythplugins-%{version}/mythweather/AUTHORS %doc mythplugins-%{version}/mythweather/COPYING %doc mythplugins-%{version}/mythweather/README %{_libdir}/mythtv/plugins/libmythweather.so %{_datadir}/mythtv/i18n/mythweather_*.qm %{_datadir}/mythtv/weather_settings.xml %{_datadir}/mythtv/mythweather %files -n mythgallery %defattr(-,root,root,-) %doc mythplugins-%{version}/mythgallery/AUTHORS %doc mythplugins-%{version}/mythgallery/COPYING %doc mythplugins-%{version}/mythgallery/README %{_libdir}/mythtv/plugins/libmythgallery.so %{_datadir}/mythtv/i18n/mythgallery_*.qm %{_localstatedir}/lib/pictures %files -n mythgame %defattr(-,root,root,-) %dir %{_sysconfdir}/mythgame %config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml %{_libdir}/mythtv/plugins/libmythgame.so %{_datadir}/mythtv/games %exclude %{_datadir}/mythtv/games/xmame %{_datadir}/mythtv/game_settings.xml %{_datadir}/mythtv/i18n/mythgame_*.qm %files -n mythgame-emulators %defattr(-,root,root,-) %{_datadir}/mythtv/games/xmame %{_datadir}/mame/screens %{_datadir}/mame/flyers %files -n mythnews %defattr(-,root,root,-) %doc mythplugins-%{version}/mythnews/AUTHORS %doc mythplugins-%{version}/mythnews/COPYING %doc mythplugins-%{version}/mythnews/README %{_libdir}/mythtv/plugins/libmythnews.so %{_datadir}/mythtv/mythnews %{_datadir}/mythtv/i18n/mythnews_*.qm %files -n mythbrowser %defattr(-,root,root,-) %doc mythplugins-%{version}/mythbrowser/AUTHORS %doc mythplugins-%{version}/mythbrowser/COPYING %doc mythplugins-%{version}/mythbrowser/README %{_bindir}/mythbrowser %{_libdir}/mythtv/plugins/libmythbookmarkmanager.so %{_datadir}/mythtv/i18n/mythbrowser_*.qm %files -n mythphone %defattr(-,root,root,-) %doc mythplugins-%{version}/mythphone/AUTHORS %doc mythplugins-%{version}/mythphone/COPYING %doc mythplugins-%{version}/mythphone/README %doc mythplugins-%{version}/mythphone/TODO %{_libdir}/mythtv/plugins/libmythphone.so %{_datadir}/mythtv/i18n/mythphone_*.qm %files -n mythcontrols %defattr(-,root,root,-) %doc mythplugins-%{version}/mythcontrols/AUTHORS %doc mythplugins-%{version}/mythcontrols/COPYING %doc mythplugins-%{version}/mythcontrols/README %doc mythplugins-%{version}/mythcontrols/TODO %{_libdir}/mythtv/plugins/libmythcontrols.so %{_datadir}/mythtv/i18n/mythcontrols_*.qm %files -n mythflix %defattr(-,root,root,-) %doc mythplugins-%{version}/mythflix/AUTHORS %doc mythplugins-%{version}/mythflix/COPYING %doc mythplugins-%{version}/mythflix/README %{_libdir}/mythtv/plugins/libmythflix.so %{_datadir}/mythtv/mythflix %{_datadir}/mythtv/i18n/mythflix_*.qm %{_datadir}/mythtv/i18n/mythflix_*.ts %{_datadir}/mythtv/netflix_menu.xml %files -n mytharchive %defattr(-,root,root,-) %doc mythplugins-%{version}/mytharchive/AUTHORS %doc mythplugins-%{version}/mytharchive/COPYING %doc mythplugins-%{version}/mytharchive/README %doc mythplugins-%{version}/mytharchive/TODO %{_bindir}/mytharchivehelper %{_libdir}/mythtv/plugins/libmytharchive.so %{_datadir}/mythtv/archiveformat.xml %{_datadir}/mythtv/archivemenu.xml %{_datadir}/mythtv/archiveutils.xml %{_datadir}/mythtv/mytharchive %{_datadir}/mythtv/i18n/mytharchive_*.qm %files -n mythzoneminder %defattr(-,root,root,-) %{_libdir}/mythtv/plugins/libmythzoneminder.so %{_datadir}/mythtv/zonemindermenu.xml %{_bindir}/mythzmserver %files -n mythweb %defattr(-,root,root,-) %doc mythplugins-%{version}/mythweb/README %config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf %defattr(-,apache,apache,0775) %dir %{_datadir}/mythweb %{_datadir}/mythweb/* %files -n perl-MythTV %defattr(-,root,root,-) %{perl_vendorlib}/MythTV.pm %dir %{perl_vendorlib}/MythTV %{perl_vendorlib}/MythTV/*.pm %{perl_vendorlib}/IO/Socket/INET/MythTV.pm %exclude %{perl_vendorarch}/auto/MythTV/.packlist %files -n python-MythTV %defattr(-,root,root,-) %dir %{python_sitelib}/MythTV/ %{python_sitelib}/MythTV/* %if 0%{?fedora} >= 9 %{python_sitelib}/MythTV-*.egg-info %endif %changelog * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8 - Don't BR: libdvdcss-devel - Update release-0-21-fixes patches (r18161) - Rebuild for libraw1394 v2.0.0 * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7 - rebuild * Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7 - Disable XvMC VLD and Pro support on ppc due to lack of openchrome driver. * Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6 - Fix spec typo - Disable mythstream patch for now, too much fuzz, revisit later * Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5 - Update release-0-21-fixes patches (r17859) - Don't use %%bcond, breaks on some older buildsystems - Put several bits in -common sub-package, as both backend and frontend may need them for one reason or another * Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4 - Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel - Make building with nVidia XvMC an available custom option, fix up conflict between it and other XvMC implementations - Update release-0-21-fixes patches (r17338) * Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3 - Fix up PACKAGE-LICENSING inclusion * Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2 - RPMFusion package review cleanups - Put mythtv-setup.desktop in mythtv-setup package - Fix up initscript to start properly - Drop unused %%ghostattr define - Attempt to clarify licensing - Clean up assorted Requires and BuildRequires - Update release-0-21-fixes patches (r16965) * Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1 - MythTV 0.21 (r16468) - Add release-0-21-fixes for DVD menu display fix (r16486) * Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394 - Update to latest release-0-21-fixes pre-release branch code (16394). * Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316 - Update to latest release-0-21-fixes pre-release branch code (16316). - Add mythgame-emulators meta-package that requires a bunch of emulators for roms mythgame knows about. - Account for python egg on f9+ - Enable gsm support by default * Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307 - Update to latest release-0-21-fixes pre-release branch code (16307). - Try to fix up a bunch of rpmlint warnings and errors. * Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238 - Update to latest svn trunk (16238). - Package up python bits. * Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019 - Update to latest svn trunk (16019). * Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914 - Update to latest svn trunk (15914). - Turn on multi-threaded video decoding. * Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699 - More spec file overhauling, make it build in Fedora 9 * Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699 - Update to latest svn trunk (15699). - Misc spec reformatting. * Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614 - Update to latest svn trunk (15614). * Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281 - Update to latest svn trunk (15281). - Fix up version-release insertion in mythbackend --version output * Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081 - Update to latest svn trunk (15081). * Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888 - Update to latest svn trunk (14888). * Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695 - Update to latest svn trunk (14695). * Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667 - Update to latest svn trunk (14667). - Build dvb support against kernel-headers instead - Drop unnecessary patches - Tweak BR: to not use any file deps (I only care about recent distros) - Rework mythweb bits to be compliant w/Fedora packaging guidelines - Enable OpenGL video output support - Make dvb and opengl bits non-conditional (always enabled) * Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658 - Update to latest svn trunk (14658). - Tweak configure options a bit more * Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589 - Update to latest svn trunk (14589). - Restructure how optflags are passed into build - Nuke some extra non-standard macros - Drop ancient dvb tarball, create with_dvb option, always using v4l-devel * Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488 - Update to latest svn trunk (14488). * Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346 - Update to latest svn trunk (14346). * Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337 - Update to latest svn trunk (14337). * Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492 - Update to latest svn trunk (13492). - More non-standard macro nuking * Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487 - Update to latest svn trunk (13487). - Reshuffle theme files - Credit where credit is due: forking this off the current ATrpms spec --- NEW FILE mythweb.conf --- # # Apache configuration directives for MythWeb. Please read INSTALL for setup # requirements and troubleshooting, along with the comments in this file. # # # CHANGE THIS PATH TO MATCH YOUR MYTHWEB INSTALLATION DIRECTORY! e.g. # # /var/www # /home/www/htdocs # /var/www/html/mythweb # /srv/www/htdocs/mythweb # Alias /mythweb/ "/usr/share/mythweb/" <Directory "/usr/share/mythweb"> ############################################################################ # I *strongly* urge you to turn on authentication for MythWeb. It is disabled # by default because it requires you to set up your own password file. Please # see the man page for htdigest and then configure the folowing four directives # to suit your authentication needs. # # AuthType Digest # AuthName "MythWeb" # AuthUserFile /etc/httpd/conf.d/mythweb-htdigest # Require valid-user # BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On # Order allow,deny # Satisfy any # # * If you're running Apache earlier than 2.2, you will need to use # the AuthDigestFile command instead of AuthUserFile (3rd line above). # ############################################################################ # Some special instructions for the MythWeb controller files # <Files mythweb.*> # # Use the following environment settings to tell MythWeb where you want it to # look to connect to the database, the name of the database to connect to, and # the authentication info to use to connect. The defaults will usually work # fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on # a different server from your main backend. Make sure you have mod_env enabled. # setenv db_server "localhost" setenv db_name "mythconverg" setenv db_login "mythtv" setenv db_password "mythtv" # # By default, MythWeb uses the hostname program to look up the hostname of the # machine it runs on. If this reports incorrect data, or you run MythWeb on a # machine without the hostname program, set this to your current hostname. # # setenv hostname "my_mythbox" # # By default, php will always search the current directory for include files, # but if you wish to install these directories outside of the current path # (eg. for security reasons), set this variable to the directory that # contains the directories like languages and templates. eg. # # setenv include_path "/usr/share/mythweb" # If you want MythWeb to email php/database errors (and a backtrace) to you, # uncomment and set the email address below. # # setenv error_email "mythweb_errors(a)example.com" # # If your local file system is something other than UTF-8, set this variable # so that the music and video portions of MythWeb can provide proper links # to your downloadable files. # # setenv fs_encoding "ISO-8859-1" </Files> ############################################################################ # The following settings relate to PHP config. # <Files *.php> # These settings are intended for apache 2.x. If your version of apache # doesn't support php_value, or things like memory_limit aren't working # as expected, then use these settings as examples for your own php.ini # files. php_value safe_mode 0 php_value memory_limit 32M php_value register_globals 0 php_value magic_quotes_gpc 0 php_value file_uploads 0 php_value allow_url_fopen On php_value zlib.output_handler Off php_value output_handler NULL # Note: php_flag does not work in older versions of php php_flag output_handler "NULL" </Files> ############################################################################ # The settings below relate specifically to mod_rewrite and the rewrite # engine used to make the MythWeb user experience a little easier to deal # with by simplifying the URLs needed to access the various sections. Do # not touch these settings unless you really know what you're doing.. # # Turn on the rewrite engine RewriteEngine on # If MythWeb is installed outside of the document root (eg. using Alias) then # you will need to set this directive to the base URL that MythWeb is visible # from externally. If you do not, the web server will return 'not found'. RewriteBase /mythweb # Skip out early if we've already been through rewrites, # or if this is a /css/, /js/ or /cache/ directory request. RewriteRule ^(css|data|images|js|themes|skins|[a-z_]+\.(php|pl))(/|$) - [L] # Redirect /pl/ requests to the perl cgi handler. RewriteRule ^(pl(/.*)?)$ mythweb.pl/$1 [QSA,L] # Redirect most of the remaining URL requests to the main mythweb script. # It will then handle any requests given to it. RewriteRule ^(.+)$ mythweb.php/$1 [QSA,L] # If you're experiencing trouble with the previous two lines in your copy of # apache, you could instead use something like: # RewriteRule ^(pl(/.*)?)$ mythweb.pl?PATH_INFO=/$1 [L,QSA] # RewriteRule ^(.+)$ mythweb.php?PATH_INFO=/$1 [L,QSA] # Catch anything else that comes through and send it to mythweb.php with no parameters. RewriteRule ^(.*)$ mythweb.php [QSA,L] ############################################################################ # You really shouldn't need to edit anything below this line, so please # don't unless you know what you're doing. # # Allow .htaccess to override whatever it wants from the server config. AllowOverride All # Allow browsers to follow symlinks that point outside of the web document # tree. This is how we access music, videos, etc. Options FollowSymLinks # MythTV now uses the correct file suffix for mpeg files, so all .nuv files # should actually be NuppleVideo. However, apache probably doesn't know what # those are, so we should tell it. AddType video/nuppelvideo .nuv # Specify the MIME type for favicon.ico in case the server configuration # doesn't or in case the server configuration uses the IANA-approved MIME type # (image/vnd.microsoft.icon)--which most browsers won't recognize. AddType image/x-icon .ico # Enable mod_deflate. This works MUCH more reliably than PHP's built-in # gzip/Zlib compressors. It is disabled here because many distros seem not # to enable mod_deflate by default, but I strongly recommend that you # enable this section. # BrowserMatch ^Mozilla/4 gzip-only-text/html BrowserMatch ^Mozilla/4\.0[678] no-gzip BrowserMatch \bMSIE !no-gzip !gzip-only-text/html # AddOutputFilterByType DEFLATE text/html AddOutputFilterByType DEFLATE text/css AddOutputFilterByType DEFLATE application/x-javascript # This is helpful for mod_deflate -- it prevents proxies from changing # the user agent to/from this server, which can prevent compression from # being enabled. It is disabled here because many distros seem not to # enable mod_headers by default, but I recommend that you enable it. # Header append Vary User-Agent env=!dont-vary # Set up the perl handler so we can stream properly. # # IMPORTANT!! Please see the note in INSTALL section 5.1 that explains why # this may not always properly detect mod_perl. # <Files *.pl> <IfModule mod_perl.c> SetHandler perl-script PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders </IfModule> <IfModule !mod_perl.c> SetHandler cgi-script </IfModule> Options +ExecCGI </Files> </Directory> <Directory "/usr/share/mythweb/data"> Options -All +FollowSymLinks +IncludesNoExec </Directory> # You will probably also want to uncomment the following rules, which # disable authentication for MythWeb's download URLs so you can properly # stream to media players that don't work with authenticated servers. # <LocationMatch .*/pl/stream/[0-9]+/[0-9]+> Allow from all </LocationMatch> <LocationMatch .*/music/stream.php> Allow from all </LocationMatch> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:54:04 -0000 1.1 +++ .cvsignore 3 Sep 2008 15:01:03 -0000 1.2 @@ -0,0 +1,4 @@ +mythfrontend.png +mythtv-setup.png +mythplugins-0.21.tar.bz2 +mythtv-0.21.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:54:04 -0000 1.1 +++ sources 3 Sep 2008 15:01:03 -0000 1.2 @@ -0,0 +1,4 @@ +be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png +be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png +6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2 +49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2

16 years, 2 months

1
0
0 / 0

rpms/mythtv/F-9 PACKAGE-LICENSING, NONE, 1.1 mysql.txt, NONE, 1.1 mythbackend.init.in, NONE, 1.1 mythbackend.logrotate.in, NONE, 1.1 mythbackend.sysconfig.in, NONE, 1.1 mythfrontend.desktop, NONE, 1.1 mythplugins-0.21-svnfixes.patch, NONE, 1.1 mythtv-0.20-mythstreammenu.diff, NONE, 1.1 mythtv-0.21-svnfixes.patch, NONE, 1.1 mythtv-setup.desktop, NONE, 1.1 mythtv.spec, NONE, 1.1 mythweb.conf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/mythtv/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12607 Modified Files: .cvsignore sources Added Files: PACKAGE-LICENSING mysql.txt mythbackend.init.in mythbackend.logrotate.in mythbackend.sysconfig.in mythfrontend.desktop mythplugins-0.21-svnfixes.patch mythtv-0.20-mythstreammenu.diff mythtv-0.21-svnfixes.patch mythtv-setup.desktop mythtv.spec mythweb.conf Log Message: initial import from devel branch --- NEW FILE PACKAGE-LICENSING --- The mythtv sources are all distributed under the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version, with the following exceptions: GPLv2 or QPL: ------------- mythtv/libs/libmyth/mythwizard.* LGPLv2: ------- mythtv/libs/libmyth/qmdcodec.* GPLv2+ or LGPLv2+: ---------------- mythtv/libs/libswscale/*.{c,h} LGPLv2+: -------- mythtv/libs/libavcodec/* mythtv/libs/libavformat/* mythtv/libs/libavutil/* mythtv/libs/libmyth/bio2jack.* mythtv/libs/libmythlivemedia/* mythtv/libs/libmythsoundtouch/* --- NEW FILE mysql.txt --- DBHostName=localhost # By default, Myth tries to ping the DB host to see if it exists. # If your DB host or network doesn't accept pings, set this to no: # #DBHostPing=no DBUserName=mythtv DBPassword=mythtv DBName=mythconverg DBType=QMYSQL3 # Set the following if you want to use something other than this # machine's real hostname for identifying settings in the database. # This is useful if your hostname changes often, as otherwise you # will need to reconfigure mythtv (or futz with the DB) every time. # TWO HOSTS MUST NOT USE THE SAME VALUE # #LocalHostName=my-unique-identifier-goes-here # If you want your frontend to be able to wake your MySQL server # using WakeOnLan, have a look at the following settings: # # # The time the frontend waits (in seconds) between reconnect tries. # This should be the rough time your MySQL server needs for startup # #WOLsqlReconnectWaitTime=0 # # # This is the number of retries to wake the MySQL server # until the frontend gives up # #WOLsqlConnectRetry=5 # # # This is the command executed to wake your MySQL server. # #WOLsqlCommand=echo 'WOLsqlServerCommand not set' --- NEW FILE mythbackend.init.in --- #!/bin/bash # # Startup script for mythbackend # # chkconfig: - 86 14 # description: mythbackend. # processname: mythbackend # pidfile: @rundir(a)/mythbackend.pid # config: # Source function library. . @initdir@/functions if [ -f @sysconfigdir@/mythbackend ]; then . @sysconfigdir@/mythbackend fi ## Defaults, override them in @sysconfigdir@/mythbackend : ${MYTHTV_HOME=@sysconfdir@/mythtv} binary=@bindir@/mythbackend prog=mythbackend RETVAL=0 OPTIONS="$OPTIONS --daemon --logfile @logdir(a)/mythtv/$prog.log --pidfile @rundir(a)/$prog.pid" start() { echo -n $"Starting $prog: " touch @rundir(a)/mythbackend.pid; chown mythtv:mythtv @rundir(a)/mythbackend.pid export MYTHCONFDIR="$MYTHTV_HOME" export HOME="$MYTHTV_HOME" daemon $binary $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch @subsysdir@/$prog return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc $binary RETVAL=$? echo [ $RETVAL = 0 ] && rm -f @subsysdir@/$prog @rundir(a)/$prog.pid } # See how we were called. case "$1" in start) start ;; stop) stop ;; reload|restart) stop start ;; status) status $prog ;; *) echo $"Usage: $prog {start|stop|status|restart}" exit 1 esac exit $RETVAL --- NEW FILE mythbackend.logrotate.in --- @logdir(a)/mythtv/mythbackend.log { notifempty missingok compress compresscmd /usr/bin/bzip2 uncompresscmd /usr/bin/bunzip2 compressext .bz2 weekly rotate 4 size 10M postrotate /bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true endscript } --- NEW FILE mythbackend.sysconfig.in --- #MYTHTV_HOME=@sysconfdir@/mythtv #OPTIONS= --- NEW FILE mythfrontend.desktop --- [Desktop Entry] Encoding=UTF-8 Name=mythTV frontend Comment=Record, playback and watch TV. Icon=mythfrontend.png Exec=mythfrontend Terminal=false Type=Application mythplugins-0.21-svnfixes.patch: --- NEW FILE mythplugins-0.21-svnfixes.patch --- Index: mythplugins/mythweb/modules/music/stream.php =================================================================== --- mythplugins/mythweb/modules/music/stream.php (revision 16468) +++ mythplugins/mythweb/modules/music/stream.php (working copy) @@ -76,8 +76,11 @@ $mime = 'audio/mpeg'; break; case 'ogg': - $mine = 'application/ogg'; + $mime = 'application/ogg'; break; + case 'm4a': + $mime = 'audio/mp4a-latm'; + break; default: $mime = 'application/octet-stream'; } Index: mythplugins/mythweb/modules/_shared/lang/German.lang =================================================================== --- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468) +++ mythplugins/mythweb/modules/_shared/lang/German.lang (working copy) @@ -17,6 +17,7 @@ "$1 hrs" $1 Std. "$1 is not responding." + $1 antwortet nicht "$1 KB" $1 kB "$1 MB" @@ -34,6 +35,7 @@ "$1 recordings" $1 Aufnahmen "$1 requests pending." + $1 Anfragen zu bearbeiten "$1 Search" $1 Suche "$1 TB" @@ -41,35 +43,50 @@ "$1 to $2" $1 bis $2 "$1 wasted" + $1 verschwendet "$1 year" "$1 years" + $1 Jahre "%s Song (%s)" + %s Lied (%s) "%s Songs" + %s Lieder "%s Songs (%s)" + %s Lieder (%s) "°C" "°F" "Aborted" + abgebrochen "Aborting" + breche ab "Action" Aktion "Activate" Aktivieren "Active Screens" "Add" + hinzufügen "Add Album to Current Playlist" + zur Wiedergabelsite hinzufügen "Add Mix" + Mix hinzufügen "Add Song to Current Playlist" + Lied hinzufügen "add string" + hinzufügen "Add this Playlist as a Subplaylist" "Add To Active Screens" "Additional Tables" zus. Tabellen "Admin Key" "Advanced" + erweitert "Advanced Options" Erweiterte Optionen "Advanced Search" + Erweiterte Suche "airdate" + Sendezeit "Airdate" Sendezeit "Airtime" @@ -77,11 +94,16 @@ "Album Listing" "Album Tracks" "Albums" + Alben "Albums with songs by %s" + Alben, die %s enthalten "All" + Alles "All Albums" + Alle Alben "All Categories" "All Fields" + Alles "All Genres" "All groups" Alle Gruppen @@ -94,6 +116,7 @@ "ALLOCINETYPE" "An error occured while adding your playlist." "and" + und "Any" Jeder "Any Category" @@ -103,18 +126,23 @@ "Any Program Type" Jeder Programmtyp "Append" + anhängen "Append to Current Playlist" + an Wiedergabeliste anhängen "Are you sure you want to delete the following show?" Diese Aufnahme wirklich löschen? "Are you sure you want to DELETE THIS SAVED PLAYLIST?" "Artist Listing" "Artists" + Künstler "Artists Beginning with %s" + Künstler mit Anfangsbuchstabe %s "ASX Stream" "Audio Bitrate" "Audio for Hearing Impaired" "Audio for Visually Impaired" "Auto Expire" + "Auto-expire recordings" Aufnahmen autom. löschen "Auto-flag commercials" @@ -135,17 +163,25 @@ Backend Status "Backspace" "Begin a New Search" + neue Suche "brightness" Helligkeit "Browse" + Stöbern "Browse = no" "Browse = yes" "Browse all" + Stöbere überall "Browse All Albums" + Stöbere in allen Alben "Browse Music" + Stöbern "Browse the Music Database" + Musikdatenbank durchstöbern "By Artist Beginning With" + Anfangsbuchstabe "By Genre" + Genre "callsign" Kurzname "Cancel" @@ -153,6 +189,7 @@ Aufnahme abbrechen "Cancelled" "Caps Lock" + Feststellt. "Cast" Besetzung "category" @@ -164,8 +201,11 @@ "CC" CC "Chan. Callsign" + Sender-'Callsign' "Chan. Name" + Sendername "Chan. Number" + Sendernummer "Channel" Sender "channel" @@ -175,26 +215,36 @@ "Channel Detail" Details zum Sender "Channel Info" + Senderinformationen "Channels" + Sender "channum" Sender "Check for duplicates in" Nach Wdhgn. suchen in "Childrens Movies" + Kinderfilme "Choose Genre.." "Choose Type" + auswählen [...13611 lines suppressed...] </message> </context> <context> @@ -67,11 +67,11 @@ </message> <message> <source>Set update frequency by using the up/down arrows.Minimum value is 30 Minutes.</source> - <translation type="unfinished"></translation> + <translation>Anna päivitysväli käyttäen nuolinäppäimiä. Pienin arvo on 30 minuuttia.</translation> </message> <message> <source>Press Escape or Menu to exit.</source> - <translation type="unfinished"></translation> + <translation>Paina Escape tai Menu poistuaksesi.</translation> </message> </context> <context> @@ -101,17 +101,18 @@ <name>QObject</name> <message> <source>MythNews</source> - <translation type="unfinished"></translation> + <translation>MythUutiset</translation> </message> <message> <source>Are you sure you want to delete this news site %1</source> - <translation type="unfinished"></translation> + <translation>Poistetaanko varmasti tämä uutislähde +%1</translation> </message> <message> <source>Downloading media...</source> - <translation type="unfinished"></translation> + <translation>Ladataan uutisia...</translation> </message> </context> <context> Index: mythplugins/mythnews/i18n/mythnews_nl.ts =================================================================== --- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468) +++ mythplugins/mythnews/i18n/mythnews_nl.ts (working copy) @@ -1,51 +1,65 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS><TS version="1.1" language="nl"> +<defaultcodec></defaultcodec> <context> <name>MythNews</name> <message> + <location filename="../mythnews/mythnews.cpp" line="516"/> <source>Updated</source> <translation>Ververst</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="523"/> <source>Unknown</source> <translation>Onbekend</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="998"/> <source>Edit Site Details</source> <translation>Bewerk Site Details</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1000"/> <source>Enter Site Details</source> <translation>Geef Site Details</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1016"/> <source>Name:</source> <translation>Naam:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1028"/> <source>URL:</source> <translation>URL:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1039"/> <source>Icon:</source> <translation>Icoon:</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1051"/> <source>OK</source> <translation>OK</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1093"/> <source>Cancel</source> <translation>Annuleer</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1090"/> <source>Edit News Site</source> <translation>Bewerk Nieuws Site</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1091"/> <source>Add News Site</source> <translation>Voeg Nieuws Site Toe</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1092"/> <source>Delete News Site</source> <translation>Verwijder Nieuws Site</translation> </message> @@ -53,47 +67,57 @@ <context> <name>MythNewsConfig</name> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="259"/> <source>Press MENU to set the update frequency.</source> <translation>MENU kiezen om verversingsfrequentie aan te passen</translation> </message> <message> + <location filename="" line="7471221"/> <source>Set update frequency by using the up/down arrows. The minimum allowed value is 30 Minutes.</source> <translation type="obsolete">Verversingsfrequentie kiezen met pijltoetsen. De minimumwaarde is 30 minuten.</translation> </message> <message> + <location filename="" line="7471221"/> <source>Press MENU to return to feed selection.</source> <translation type="obsolete">MENU kiezen om terug te keren.</translation> </message> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="308"/> <source>Set update frequency by using the up/down arrows.Minimum value is 30 Minutes.</source> - <translation type="unfinished"></translation> + <translation>Verversingsfrequentie kiezen met pijltoetsen. De minimumwaarde is 30 minuten.</translation> </message> <message> + <location filename="../mythnews/mythnewsconfig.cpp" line="313"/> <source>Press Escape or Menu to exit.</source> - <translation type="unfinished"></translation> + <translation>Gebruik escape of menu om af te sluiten.</translation> </message> </context> <context> <name>NewsSite</name> <message> + <location filename="../mythnews/newsengine.cpp" line="217"/> <source>Failed to retrieve news</source> <translation>Kon berichten niet ophalen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="197"/> <source>Retrieve Failed. </source> <translation>Ophalen mislukt. </translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="206"/> <source>No Cached News</source> <translation>Geen nieuws in geheugen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="219"/> <source>Failed to read downloaded file</source> <translation>Ka opgehaalde bestand niet lezen</translation> </message> <message> + <location filename="../mythnews/newsengine.cpp" line="225"/> <source>Showing Cached News</source> <translation>Nieuws in geheugen wordt getoond</translation> </message> @@ -101,10 +125,12 @@ <context> <name>QObject</name> <message> + <location filename="../mythnews/mythnews.cpp" line="1134"/> <source>MythNews</source> <translation>MythNieuws</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="1136"/> <source>Are you sure you want to delete this news site %1</source> @@ -113,13 +139,15 @@ %1</translation> </message> <message> + <location filename="../mythnews/mythnews.cpp" line="843"/> <source>Downloading media...</source> - <translation type="unfinished"></translation> + <translation>Media aan het downloaden...</translation> </message> </context> <context> <name>ThemeUI</name> <message> + <location filename="themestrings.h" line="2"/> <source>Minutes</source> <translation>Minuten</translation> </message> mythtv-0.20-mythstreammenu.diff: --- NEW FILE mythtv-0.20-mythstreammenu.diff --- --- themes/blue/theme.xml~ 2006-03-27 16:13:40.000000000 +0100 +++ themes/blue/theme.xml 2006-03-27 16:13:40.000000000 +0100 @@ -745,6 +745,11 @@ <image>setup.png</image> <offset>22,10</offset> </buttondef> + + <buttondef name="STREAM"> + <image>stream.png</image> + <offset>60,30</offset> + </buttondef> </myththeme> --- programs/mythfrontend/library.xml~ 2006-03-27 16:12:24.000000000 +0100 +++ programs/mythfrontend/library.xml 2006-03-27 16:12:24.000000000 +0100 @@ -139,5 +139,12 @@ <action>PLUGIN mythgame</action> <depends>mythgame</depends> </button> + + <button> + <type>STREAM</type> + <text>Internet streams</text> + <action>PLUGIN mythstream</action> + <depends>mythstream</depends> + </button> </mythmenu> --- programs/mythfrontend/media_settings.xml~ 2006-03-27 16:13:09.000000000 +0100 +++ programs/mythfrontend/media_settings.xml 2006-03-27 16:13:09.000000000 +0100 @@ -141,4 +141,11 @@ <depends>mythburn</depends> </button> + <button> + <type>STREAM</type> + <text>Stream settings</text> + <action>CONFIGPLUGIN mythstream</action> + <depends>mythstream</depends> + </button> + </mythmenu> mythtv-0.21-svnfixes.patch: --- NEW FILE mythtv-0.21-svnfixes.patch --- Index: mythtv/i18n/mythfrontend_nb.ts =================================================================== --- mythtv/i18n/mythfrontend_nb.ts (revision 16468) +++ mythtv/i18n/mythfrontend_nb.ts (working copy) @@ -151,7 +151,7 @@ </message> <message> <source>Use channel scanner to find channels for this input.</source> - <translation>Bruk kanalsøkeren for å finne kanaler fro denne inndatakilden.</translation> + <translation>Bruk kanalsøkeren for å finne kanaler for denne inndatakilden.</translation> </message> <message> <source>This uses the listings data source to provide the channels for this input.</source> @@ -391,7 +391,7 @@ </message> <message> <source>Anytime on a specific day of the week</source> - <translation>Nårr som helst på en bestemt ukedag</translation> + <translation>Når som helst på en bestemt ukedag</translation> </message> <message> <source>Only on weekdays (Monday through Friday)</source> @@ -1165,7 +1165,7 @@ </message> <message> <source>The connection to the master backend server has gone away for some reason.. Is it running?</source> - <translation>Tilkoblingen til hovedtjeneren har av en eller anenn grunn forsvunnet. Kjører den?</translation> + <translation>Tilkoblingen til hovedtjeneren har av en eller annen grunn forsvunnet. Kjører den?</translation> </message> <message> <source>There are also other clients using this database. They should be shut down first.</source> @@ -1216,7 +1216,7 @@ <source>The theme you are using is missing the 'file_browser_background' element. Returning to the previous menu.</source> - <translation>Temaet som brukes mangler elementet «file_borwsser_background». + <translation>Temaet som brukes mangler elementet «file_browser_background». Går tilbake til forrige meny.</translation> </message> @@ -1224,7 +1224,7 @@ <source>The theme you are using is missing the 'file_browser' element. Returning to the previous menu.</source> - <translation>Temaet som brukes mangler elementet «file_borwser». + <translation>Temaet som brukes mangler elementet «file_browser». Går tilbake til forrige meny.</translation> </message> @@ -1559,7 +1559,7 @@ </message> <message> <source>Commercials are flagged</source> - <translation>Reklamer blir markert</translation> + <translation>Reklamer er markert</translation> </message> <message> <source>An editing cutlist is present</source> @@ -1949,7 +1949,7 @@ </message> <message> <source>Reverse Time</source> - <translation>Omvendt kronoligisk rekkefølge</translation> + <translation>Omvendt kronologisk rekkefølge</translation> </message> <message> <source>Sort by Title</source> @@ -2388,7 +2388,7 @@ </message> <message> <source>If this frontend's host name changes often, check this box and provide a network-unique name to identify it. If unchecked, the frontend machine's local host name will be used to save preferences in the database.</source> - <translation>Hvis klientens vertsnavn enders ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> + <translation>Hvis klientens vertsnavn endres ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> </message> <message> <source>Custom identifier</source> @@ -3163,7 +3163,7 @@ </message> <message> <source>This showing will be recorded.</source> - <translation>Denne sendingen vil bil tatt opp.</translation> + <translation>Denne sendingen vil bli tatt opp.</translation> </message> <message> <source>This showing is being recorded.</source> @@ -3183,7 +3183,7 @@ </message> <message> <source>This showing was not recorded because </source> - <translation>Denne sendingen vil ikke bli tatt opp fordi </translation> + <translation>Denne sendingen ble ikke tatt opp fordi </translation> </message> <message> <source>it was manually set to not record.</source> @@ -3818,7 +3818,7 @@ </message> <message> <source>Match duplicates using subtitle</source> - <translation>Finn duplisering ved hejlp av undertittel</translation> + <translation>Finn duplisering ved hjelp av undertittel</translation> </message> <message> <source>Match duplicates using description</source> @@ -3850,7 +3850,7 @@ </message> <message> <source>Allow auto expire</source> - <translation>Tillatt automatisk utløing</translation> + <translation>Tillat automatisk utløping</translation> </message> <message> <source>Don't allow auto expire</source> @@ -3866,11 +3866,11 @@ </message> <message> <source>Delete oldest if this would exceed the max episodes</source> - <translation>Slett den eldste hvis denne overstiger tillate episoder</translation> + <translation>Slett den eldste hvis denne overstiger antall tillatte episoder</translation> </message> <message> <source>Don't record if this would exceed the max episodes</source> - <translation>Ikke ta opp hvis denne overstiger tillate episoder</translation> + <translation>Ikke ta opp hvis denne overstiger antall tillatte episoder</translation> </message> <message> <source>No episode limit</source> @@ -3956,7 +3956,7 @@ <source>You MUST run 'mythfilldatabase --manual the first time, instead of just 'mythfilldatabase'. Your grabber does not provide channel numbers, so you have to set them manually.</source> - <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnumbre, så disse må angis manuelt.</translation> + <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnummer, så disse må angis manuelt.</translation> </message> <message> <source>Video source setup</source> @@ -4242,7 +4242,7 @@ </message> <message> <source>Enable this setting if MythTV is playing "crackly" audio and you are using hardware encoding. This setting will have no effect on MPEG-4 or RTJPEG video. MythTV will keep extra audio data in its internal buffers to workaround this bug.</source> - <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholde ekstra lyddata i dets interne hurtigminne.</translation> + <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholder ekstra lyddata i dets interne hurtigminne.</translation> </message> <message> <source>PIP Video Location</source> @@ -4410,7 +4410,7 @@ </message> <message> <source>New Recording Free Disk Space Threshold (in Megabytes)</source> - <translation>MInimum ledig diskplass for å ta opp (i MB)</translation> + <translation type="unfinished">Minimum ledig diskplass for å ta opp (i MB)</translation> </message> <message> <source>MythTV will stop scheduling new recordings on a backend when its free disk space falls below this value.</source> @@ -4418,7 +4418,7 @@ </message> <message> <source>Time to record before start of show (in seconds)</source> - <translation>TId å ta opp før programstart (i sekunder)</translation> + <translation type="unfinished">Tid å ta opp før programstart (i sekunder)</translation> </message> <message> <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> @@ -4430,7 +4430,7 @@ </message> <message> <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> - <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planlaggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> + <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planleggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> </message> <message> <source>List Newest Recording First</source> @@ -4470,7 +4470,7 @@ </message> <message> <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can't be decreased further.</source> - <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodues bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodues hvis farten ikke kan reduseres mer.</translation> + <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodus bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodus hvis farten ikke kan reduseres mer.</translation> </message> <message> <source>Menu theme</source> @@ -4578,7 +4578,7 @@ </message> <message> <source>UDP Notify Port</source> - <translation>UPD-notifiseringsport</translation> + <translation>UDP-notifiseringsport</translation> </message> <message> <source>During playback, MythTV will listen for connections from the "mythtvosd" or "mythudprelay" programs on this port. See the README in contrib/mythnotify/ for additional information.</source> @@ -4662,7 +4662,7 @@ </message> <message> <source>"Fill" is the quickest shading method. "Image" is somewhat slow, but has a higher visual quality. No shading will be the fastest.</source> - <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere men ser bedre ut. Ingen skyggelegging er raskest.</translation> + <translation>«Fyll» er den raskeste skyggeleggingsmetoden, mens «Bilde» er treigere, men ser bedre ut. Ingen skyggelegging er raskest.</translation> </message> <message> <source>System Exit key</source> @@ -4690,7 +4690,7 @@ [...28852 lines suppressed...] +:: Script to run mythbackend through gdb (easily?) +:: There is likely a more efficient way of doing this, +:: but we have to start somewhere. +:: +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: This script is used for gathering backtraces using gdb +Echo COMMENTS: See: http://www.mythtv.org/docs/mythtv-HOWTO-22.html#ss22.2 +Echo COMMENTS: See: http://www.mythtv.org/wiki/index.php/Windows_Port +Echo COMMENTS: -------------------------------------- +Echo. +:: +:gdbcommands +:: +:: Check for and Create if needed the .\gdbcommands.txt +:: +:: syntax taken from [ http://www.mythtv.org/docs/mythtv-HOWTO.html#toc22.2 ] +:: +if not exist ./gdbcommands.txt ( + echo handle SIGPIPE nostop noprint > .\gdbcommands.txt + echo handle SIG33 nostop noprint >> .\gdbcommands.txt + echo set logging on >> .\gdbcommands.txt + echo set pagination off >> .\gdbcommands.txt + echo set args -l myth.log --noupnp --nosched --nojobqueue --nohousekeeper --noautoexpire -v all >> .\gdbcommands.txt + echo run >> .\gdbcommands.txt + echo thread apply all bt full >> .\gdbcommands.txt + echo set logging off >> .\gdbcommands.txt ) +@Echo off + +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: Clearing old gdb.txt before running gdb again. +Echo COMMENTS: -------------------------------------- +Echo. +:: +:: add current data/time to gdb.txt +:: will this be a bad idea? who knows? =) +:: +date /t > .\gdb.txt +time /t >> .\gdb.txt + +:gdb +:: +:: gdb should be in the path. +:: +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: If you need to add any switches to mythbackend edit gdbcommands.txt +Echo COMMENTS: see: "mythbackend.exe --help" for options +Echo COMMENTS: -------------------------------------- +Echo. +Echo COMMENTS: -------------------------------------- +Echo COMMENTS: Starting: gdb +Echo COMMENTS: -------------------------------------- +gdb .\mythbackend.exe -x .\gdbcommands.txt + +Echo. +Echo The backtrace can be found in .\gdb.txt +Echo. Index: mythtv/contrib/Win32/win32-packager.pl =================================================================== --- mythtv/contrib/Win32/win32-packager.pl (revision 16468) +++ mythtv/contrib/Win32/win32-packager.pl (working copy) @@ -68,11 +68,13 @@ # it has NOT been tested much, and will with HIGH PROBABILITY fail somewhere. # TODO - Only $mingw is tested and most likely is safe to change. -# perl compatible paths (single forward slashes in DOS style): -my $msys = 'C:/MSys/1.0/'; # must end in slash, and use forward slashes / -my $sources = 'C:/msys/1.0/sources/'; # must end in slash, and use forward slashes / -my $mingw = 'C:/MinGW/'; # must end in slash, and use forward slashes / -my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives so c:/mythtv/mythtv/ is the main codebase. # must end in slash, and use forward slashes / +# Perl compatible paths. DOS style, but forward slashes, and must end in slash: +my $msys = 'C:/MSys/1.0/'; +my $sources = 'C:/msys/1.0/sources/'; +my $mingw = 'C:/MinGW/'; +my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives + # so c:/mythtv/mythtv/ is the main codebase. +my $build = 'C:/mythtv/build/'; # where 'make install' installs into # DOS executable CMD.exe versions of the paths (for when we shell to DOS mode): my $dosmsys = perl2dos($msys); @@ -80,11 +82,17 @@ my $dosmingw = perl2dos($mingw); my $dosmythtv = perl2dos($mythtv); -# unix/msys equivalent versions of the paths (for when we shell to MSYS/UNIX mode): -my $unixmsys = '/'; # msys root is always mounted here, irrespective of where DOS says it really is. -my $unixmingw = '/mingw/'; # mingw is always mounted here under unix, if you setup mingw right in msys, so we will usually just say /mingw in the code, not '.$unixmingw.' or similar (see /etc/fstab) -my $unixsources = perl2unix($sources); $unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / +# Unix/MSys equiv. versions of the paths (for when we shell to MSYS/UNIX mode): +my $unixmsys = '/'; # MSys root is always mounted here, + # irrespective of where DOS says it really is. +my $unixmingw = '/mingw/'; # MinGW is always mounted here under unix, + # if you setup mingw right in msys, + # so we will usually just say /mingw in the code, + # not '.$unixmingw.' or similar (see /etc/fstab) +my $unixsources = perl2unix($sources); +$unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under / my $unixmythtv = perl2unix($mythtv); +my $unixbuild = perl2unix($build); #NOTE: ITS IMPORTANT that the PATHS use the correct SLASH-ing method for the type of action: @@ -520,7 +528,16 @@ [ grep => ['Makefile|MAKEFILE',$mythtv.'mythtv/Makefile'], shell => ['rm '.$unixmythtv.'mythtv/Makefile','nocheck'], comment => 'broken Makefile, delete it' ], # configure -[ file => $mythtv.'mythtv/Makefile', shell => ['source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','./configure --prefix=/usr --disable-dbox2 --disable-hdhomerun --disable-dvb --disable-ivtv --disable-iptv --disable-joystick-menu --disable-xvmc-vld --disable-x11 --disable-xvmc --enable-directx --enable-memalign-hack --cpu=k8 --compile-type=debug'], comment => 'do we already have a Makefile for mythtv?' ], +[ file => $mythtv.'mythtv/Makefile', + shell => ['source '.$unixmythtv.'qt_env.sh', + 'cd '.$unixmythtv.'mythtv', + './configure --prefix='.$unixbuild.' --runtime-prefix=..'. + ' --disable-dbox2 --disable-hdhomerun'. + ' --disable-dvb --disable-ivtv --disable-iptv'. + ' --disable-joystick-menu --disable-xvmc-vld --disable-x11'. + ' --disable-xvmc --enable-directx'. + ' --enable-memalign-hack --cpu=k8 --compile-type=debug'], +comment => 'do we already have a Makefile for mythtv?' ], # make [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], Index: mythtv/contrib/OSX/osx-packager.pl =================================================================== --- mythtv/contrib/OSX/osx-packager.pl (revision 16468) +++ mythtv/contrib/OSX/osx-packager.pl (working copy) @@ -577,6 +577,7 @@ 'mythtv' => [ '--prefix=' . $PREFIX, + '--runtime-prefix=../Resources', # To "cross compile" something for a lesser Mac: #'--tune=G3', #'--disable-altivec', @@ -1041,6 +1042,13 @@ if ( $OPT{'verbose'} ) { push @bundler, '--verbose' } +### Framework that has a screwed up link dependency path +my $AVCfw = '/Developer/FireWireSDK*/Examples/' . + 'Framework/AVCVideoServices.framework'; +my @AVCfw = split / /, `ls -d $AVCfw`; +my $AVCfw = pop @AVCfw; +chop $AVCfw; + ### Create each package. ### Note that this is a bit of a waste of disk space, ### because there are now multiple copies of each library. @@ -1072,6 +1080,9 @@ # Remove copy of binary unlink "$SCRIPTDIR/$target" or die; + if ( $AVCfw ) + { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") } + if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ ) { my $res = "$finalTarget/Contents/Resources"; Index: mythtv/contrib/channel_changers/6200ch.c =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468) +++ mythtv/contrib/channel_changers/6200ch.c (working copy) @@ -76,13 +76,14 @@ #define DCT6416_VENDOR_ID2 0x00001a66 #define DCT6416_MODEL_ID1 0x0000646b -#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19) /* uses a reserved subunit type */ +#define PACE_VENDOR_ID1 0x00005094 /* 550 & 779 */ +#define PACE550_MODEL_ID1 0x00010551 +#define PACE779_MODEL_ID1 0x00010755 -#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */ #define AVC1394_6200_OPERAND_SET 0x20 /* 6200 subunit command operand */ -#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \ - AVC1394_SUBUNIT_ID_0 | AVC1394_6200_COMMAND_CHANNEL | \ +#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_PANEL | \ + AVC1394_SUBUNIT_ID_0 | AVC1394_PANEL_COMMAND_PASS_THROUGH | \ AVC1394_6200_OPERAND_SET #define STARTING_NODE 1 /* skip 1394 nodes to avoid error msgs */ @@ -240,7 +241,8 @@ (dir.vendor_id == DCT6412_VENDOR_ID1) || (dir.vendor_id == DCT6412_VENDOR_ID2) || (dir.vendor_id == DCT6416_VENDOR_ID1) || - (dir.vendor_id == DCT6416_VENDOR_ID2)) && + (dir.vendor_id == DCT6416_VENDOR_ID2) || + (dir.vendor_id == PACE_VENDOR_ID1)) && ((dir.model_id == DCH3200_MODEL_ID1) || (dir.model_id == DCT3412_MODEL_ID1) || (dir.model_id == DCT3416_MODEL_ID1) || @@ -250,7 +252,10 @@ (dir.model_id == DCT6200_MODEL_ID2) || (dir.model_id == DCT6412_MODEL_ID1) || (dir.model_id == DCT6412_MODEL_ID2) || - (dir.model_id == DCT6416_MODEL_ID1)) ) { + (dir.model_id == DCT6416_MODEL_ID1) || + (dir.model_id == PACE550_MODEL_ID1) || + (dir.model_id == PACE779_MODEL_ID1)) ) + { if (dir.unit_spec_id != DCT6200_SPEC_ID) fprintf(stderr, "Warning: Unit Spec ID different.\n"); if (dir.unit_sw_version != DCT6200_SW_VERSION) --- NEW FILE mythtv-setup.desktop --- [Desktop Entry] Encoding=UTF-8 Name=mythTV setup Comment=Setup for mythTV. Icon=mythtv-setup.png Exec=mythtv-setup Terminal=false Type=Application --- NEW FILE mythtv.spec --- # svn revision number %define _svnver r18161 %define branch release-0-21-fixes # Nb: base 0.21 svn rev is r16468 #define branch trunk # disabled options %define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} %define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0} %define with_festival %{?_with_festival: 1} %{?!_with_festival: 0} %define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} %define desktop_applications mythfrontend mythtv-setup %define desktop_vendor RPMFusion %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} Summary: A digital video recorder (DVR) application Name: mythtv Version: 0.21 %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else Release: 8%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of # projects... For a breakdown of the licensing, see PACKAGE-LICENSING. License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+) Group: Applications/Multimedia Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in Source103: mythbackend.logrotate.in Source106: mythfrontend.png Source107: mythfrontend.desktop Source108: mythtv-setup.png Source109: mythtv-setup.desktop Source110: mysql.txt Source401: mythweb.conf # Patches Patch100: mythtv-0.21-svnfixes.patch Patch101: mythtv-0.20-mythstreammenu.diff #Patch102: mythtv-0.21-fedora-settings.patch Patch200: mythplugins-0.21-svnfixes.patch #Patch201: mythplugins-0.21-fedora-settings.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: freetype-devel >= 2 BuildRequires: qt3-devel, mysql-devel >= 5 # Audio framework support BuildRequires: alsa-lib-devel, arts-devel BuildRequires: jack-audio-connection-kit-devel # Need dvb headers to build in dvb support BuildRequires: kernel-headers # Remote control support BuildRequires: lirc-devel # X, Xv, and XvMC video support BuildRequires: libXxf86vm-devel, libXmu-devel BuildRequires: libXvMC-devel, libXv-devel BuildRequires: xorg-x11-proto-devel %ifarch %{ix86} x86_64 BuildRequires: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel %endif %if %with_xvmcnvidia BuildRequires: xorg-x11-drv-nvidia-devel %endif # OpenGL video output and vsync support BuildRequires: libGL-devel, libGLU-devel # DirectFB (disabled by default) %if %with_directfb BuildRequires: directfb-devel %endif # FireWire cable box support BuildRequires: libiec61883-devel, libraw1394-devel, libavc1394-devel # BuildRequires: desktop-file-utils BuildRequires: lm_sensors-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(DBD::mysql), perl(Date::Manip), perl(HTTP::Request) BuildRequires: perl(LWP::UserAgent) BuildRequires: python-devel # Misc A/V format support BuildRequires: lame-devel BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel BuildRequires: faad2-devel BuildRequires: faac-devel BuildRequires: x264-devel BuildRequires: xvidcore-devel BuildRequires: a52dec-devel BuildRequires: libdca-devel BuildRequires: gsm-devel # mythmusic BuildRequires: libmad-devel, taglib-devel >= 1.4 BuildRequires: libvorbis-devel >= 1.0, flac-devel >= 1.0.4 BuildRequires: libcdaudio-devel >= 0.99.6, cdparanoia-devel BuildRequires: fftw2-devel >= 2.1.3, fftw2-devel < 3 BuildRequires: lame-devel BuildRequires: libGL-devel BuildRequires: SDL-devel BuildRequires: faad2-devel BuildRequires: libvisual-devel # mythgallery BuildRequires: libtiff-devel BuildRequires: libexif-devel >= 0.6.9 # mythgame BuildRequires: zlib-devel # mythvideo (nb: mythdvd and mythvideo merged) BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel >= 0.9.4, nasm BuildRequires: mjpegtools-devel >= 1.6.1, xvidcore-devel >= 0.9.1 BuildRequires: libfame-devel >= 0.9.0 BuildRequires: transcode >= 0.6.8 #BuildRequires: libdvdcss-devel >= 1.2.7 # mythbrowser BuildRequires: kdelibs3-devel # mythphone %if 0%{?fedora} >= 9 BuildRequires: ncurses-devel %else BuildRequires: libtermcap-devel %endif %if %with_festival BuildRequires: festival-devel %endif # # Requirements for the mythtv meta-package Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-frontend = %{version}-%{release} Requires: mythtv-setup = %{version}-%{release} Requires: mythplugins = %{version}-%{release} Requires: mythtv-base-themes = %{version}-%{release} Requires: mythtv-themes = %{version} Requires: mythtv-docs Requires: perl-MythTV, python-MythTV Requires: mysql-server, mysql # Not yet packaged for rpmfusion #Requires: xmltv Requires: wget >= 1.9.1 # faad2-devel.ppc64 no available, so: ExcludeArch: ppc64 %define mythfeapiver %(echo %{version} | awk -F. '{print $1 "." $2}') %description MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. There are also several add-ons and themes available. In order to faciliate installations with smart/apt-get/yum and other related package resolvers this meta-package can be used to install all in one sweep. MythTV implements the following PVR features, and more, with a unified graphical interface: - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV. - Video compression using RTjpeg or MPEG-4 - Program listing retrieval using XMLTV - Themable, semi-transparent on-screen display - Electronic program guide - Scheduled recording of TV programs - Resolution of conflicts between scheduled recordings - Basic video editing %package docs Summary: MythTV documentation Group: Documentation %description docs The MythTV documentation, contrib files, database initialization file and miscellaneous other bits and pieces. %package -n libmyth Summary: Library providing mythtv support Group: System Environment/Libraries Requires: lame, qt3 Requires: qt3-MySQL %description -n libmyth Common library code for MythTV and add-on modules (development) MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. %package -n libmyth-devel Summary: Development files for libmyth Group: Development/Libraries Requires: libmyth = %{version}-%{release} Requires: freetype-devel >= 2, lame-devel, qt3-devel, Requires: mysql-devel Requires: alsa-lib-devel, arts-devel Requires: libGL-devel, libGLU-devel Requires: kernel-headers Requires: lirc-devel Requires: xorg-x11-proto-devel Requires: libXxf86vm-devel, libXmu-devel Requires: libXvMC-devel, libXv-devel Requires: libGL-devel, libGLU-devel Requires: libiec61883-devel, libraw1394-devel, libavc1394-devel Requires: alsa-lib-devel, arts-devel Requires: jack-audio-connection-kit-devel %if %with_directfb Requires: directfb-devel %endif %description -n libmyth-devel This package contains the header files and libraries for developing add-ons for mythtv. %package base-themes Summary: Core user interface themes for mythtv Group: Applications/Multimedia %description base-themes MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv-docs package for more information. This package contains the base themes for the mythtv user interface. %package frontend Summary: Client component of mythtv (a PVR) Group: Applications/Multimedia Requires: freetype, lame Requires: mythtv-common = %{version}-%{release} Requires: mythtv-base-themes = %{version} Provides: mythtv-frontend-api = %{mythfeapiver} %description frontend MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the client software, which provides a front-end for playback and configuration. It requires access to a mythtv-backend installation, either on the same system or one reachable via the network. %package backend Summary: Server component of mythtv (a PVR) Group: Applications/Multimedia Requires: lame Requires: mythtv-common = %{version}-%{release} Conflicts: xmltv-grabbers < 0.5.37 %description backend MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the server software, which provides video and audio capture and encoding services. In order to be useful, it requires a mythtv-frontend installation, either on the same system or one reachable via the network. %package setup Summary: Setup the mythtv backend Group: Applications/Multimedia Requires: freetype Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-base-themes = %{version} %description setup MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains only the setup software for configuring the mythtv backend. %package common Summary: Common components needed by multiple other MythTV components Group: Applications/Multimedia %description common MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. This package contains components needed by multiple other MythTV components. %package -n mythplugins Summary: Main MythTV plugins Group: Applications/Multimedia Requires: mythmusic = %{version}-%{release}, mythvideo = %{version}-%{release} Requires: mythweather = %{version}-%{release}, mythgallery = %{version}-%{release} Requires: mythgame = %{version}-%{release}, mythnews = %{version}-%{release} Requires: mythbrowser = %{version}-%{release}, mythphone = %{version}-%{release} Requires: mythcontrols = %{version}-%{release}, mythflix = %{version}-%{release} Requires: mytharchive = %{version}-%{release}, mythzoneminder = %{version}-%{release} Requires: mythmovies = %{version}-%{release} Requires: mythweb = %{version}-%{release} %description -n mythplugins This is a consolidation of all the official MythTV plugins that used to be distributed as separate downloads from mythtv.org. %package -n mythmovies Summary: A module for MythTV for providing local show times and cinema listings Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythmovies MythZoneMinder is a plugin to provide show times and cinema listings based on Zip/Post code and a given radius. It uses external scripts to grab times and so can be used in any country so long as a script is written for a local data source. It ships with a grabber for the USA which uses the ignyte website. %package -n mythmusic Summary: The music player add-on module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythmusic Music add-on for mythtv. %package -n mythvideo Summary: A generic video player frontend module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} Requires: mplayer Requires: transcode >= 0.6.8 Provides: mythdvd = %{version}-%{release} Obsoletes: mythdvd < %{version}-%{release} %description -n mythvideo MythVideo is a MythTV module that allows you to play videos, DVDs and (optionally) VCDs. It can also be configured to let you rip DVDs and transcode their video and audio content to other (generally smaller) formats. The player can either use the MythTV internal software (which now supports DVD menus), or simply to invoke your favorite DVD/XVCD playing software (mplayer, ogle, xine, etc) as an external command. The transcoding is based on and derived from the excellent transcode package. %package -n mythweather Summary: A MythTV module that displays a weather forcast Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythweather A MythTV module that displays a weather forcast. %package -n mythgallery Summary: A gallery/slideshow module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythgallery A gallery/slideshow module for MythTV. %package -n mythgame Summary: A game frontend (xmame, nes, snes, pc) for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythgame A game frontend (xmame, nes, snes, pc) for MythTV. %package -n mythgame-emulators Summary: Meta-package requiring emulators for game types mythgame knows about Group: Applications/Multimedia Requires: mythgame = %{version}-%{release} # Multi Arcade Machine Emulator, Amiga, Atari 2600 Requires: sdlmame, e-uae, stella # Nintendo, Super Nintendo, Nintendo 64 Requires: fceultra, zsnes, mupen64, mupen64-ricevideo # Sega Genesis, Sega Master System, Game Gear Requires: gens, dega-sdl, osmose # TurboGraphx 16 (and others) Requires: mednafen %description -n mythgame-emulators Meta-package requiring emulators for game types mythgame knows about. %package -n mythnews Summary: An RSS news feed plugin for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythnews An RSS news feed reader plugin for MythTV. %package -n mythbrowser Summary: A small web browser module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythbrowser MythBrowser is a full fledged web-browser (multiple tabs) to display webpages in full-screen mode. Simple page navigation is possible. Starting with version 0.13 it also has full support for mouse driven navigation (right mouse opens and clos es the popup menu). MythBrowser also contains a BookmarkManager to manage the website links in a simple mythplugin. %package -n mythphone Summary: A video conferencing module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythphone Mythphone is a phone and videophone capability on MYTH using the standard SIP protocol. It is compatible with Microsoft XP Messenger and with SIP Service Providers such as Free World Dialup (fwd.pulver.com). %package -n mythcontrols Summary: A key bindings editor for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythcontrols MythControls is a key bindings editor for MythTV. %package -n mythflix Summary: A NetFlix module for MythTV Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythflix MythFlix is a NetFlix queue manager for MythTV. %package -n mytharchive Summary: A module for MythTV for creating and burning DVDs Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} Requires: python >= 2.3, MySQL-python, python-imaging Requires: mjpegtools >= 1.6.2, dvdauthor >= 0.6.11 Requires: ffmpeg >= 0.4.9, dvd+rw-tools >= 5.21.4.10.8 Requires: cdrecord >= 2.01, mkisofs >= 2.01 Requires: transcode >= 1.0.2 %description -n mytharchive MythArchive is a new plugin for MythTV that lets you create DVDs from your recorded shows, MythVideo files and any video files available on your system. %package -n mythzoneminder Summary: A module for MythTV for camera security and surveillance Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} %description -n mythzoneminder MythZoneMinder is a plugin to interface to some of the features of ZoneMinder. You can use it to view a status window similar to the console window in ZM. Also there are screens to view live camera shots and replay recorded events. %package -n mythweb Summary: The web interface to MythTV Group: Applications/Multimedia Requires: httpd >= 1.3.26, php >= 4.2.2, php-mysql >= 4.2.2 %description -n mythweb The web interface to MythTV. %package -n perl-MythTV Summary: MythTV perl bindings Group: System Environment/Libraries %description -n perl-MythTV MythTV perl bindings. %package -n python-MythTV Summary: MythTV python bindings Group: System Environment/Libraries Requires: MySQL-python %description -n python-MythTV MythTV python bindings. %prep %setup -q -c -a 1 cd mythtv-%{version} %patch100 -p1 -b .svnfixes #patch101 -p0 -b .mythstreammenu #patch102 -p1 -b .settings # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; # Nuke Windows and Mac OS X build scripts rm -rf contrib/Win32 contrib/OSX # Put perl bits in the right place and set opt flags sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \ bindings/perl/perl.pro cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} . for file in mythbackend.init \ mythbackend.sysconfig \ mythbackend.logrotate; do sed -e's|@logdir@|%{_localstatedir}/log|g' \ -e's|@rundir@|%{_localstatedir}/run|g' \ -e's|@sysconfdir@|%{_sysconfdir}|g' \ -e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \ -e's|@initdir(a)|%{_sysconfdir}/init.d|g' \ -e's|@bindir@|%{_bindir}|g' \ -e's|@sbindir@|%{_sbindir}|g' \ -e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \ -e's|@varlibdir@|%{_localstatedir}/lib|g' \ -e's|@varcachedir@|%{_localstatedir}/cache|g' \ -e's|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g' \ < $file.in > $file done cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} . cd .. temp=`pwd`/temp cd mythplugins-%{version} %patch200 -p1 -b .svnfixes #patch201 -p1 -b .settings mv mytharchive/mythburn/themes/Simple\ -\ Autoplay \ mytharchive/mythburn/themes/Simple_-_Autoplay mv mytharchive/mythburn/themes/MythCenter\ -\ Autoplay \ mytharchive/mythburn/themes/MythCenter_-_Autoplay find . -name \*.pro |\ xargs perl -pi -e's,\$\${PREFIX}/include/mythtv,'$temp%{_includedir}/mythtv, cat >> settings.pro << EOF INCLUDEPATH += $temp%{_includedir} LIBS *= -L$temp%{_libdir} EOF cd mythmusic # Fix /mnt/store -> /var/lib/mythmusic perl -pi -e's|/mnt/store/music|%{_localstatedir}/lib/mythmusic|' mythmusic/globalsettings.cpp cd .. cd mythvideo # Fix /mnt/store -> /var/lib/mythmusic perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp cd .. cd mythweb # Fix up permissions chmod -R g-w ./* cd .. echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro cd .. %build cd mythtv-%{version} ./configure \ %if %with_debug --compile-type=debug \ %else --compile-type=release \ %endif --enable-debug \ %ifarch ppc --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \ --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \ %else --extra-cflags="%{optflags} -fomit-frame-pointer" \ --extra-cxxflags="%{optflags} -fomit-frame-pointer" \ %endif %ifarch %{ix86} --cpu=i686 --tune=i686 --enable-mmx \ %endif --prefix=%{_prefix} \ --libdir-name=%{_lib} \ --enable-pthreads --enable-ffmpeg-pthreads \ --enable-joystick-menu \ --enable-lirc \ --enable-ivtv \ --enable-firewire \ --enable-dvb \ --enable-audio-oss --enable-audio-alsa --enable-audio-arts \ --enable-audio-jack \ --enable-xvmc --enable-xvmcw \ %if %with_xvmcnvidia --xvmc-lib=XvMCNVIDIA_dynamic --enable-xvmc-opengl \ %else %ifarch %{ix86} x86_64 --enable-xvmc-vld --enable-xvmc-pro \ %endif %endif --enable-x11 --x11-path=%{_includedir} \ --enable-xrandr \ --enable-xv \ --enable-opengl-video --enable-opengl-vsync \ %if %with_directfb --enable-directfb \ %else --disable-directfb \ %endif --enable-liba52 --enable-libmp3lame \ --enable-libfaac --enable-libfaad \ --enable-libtheora --enable-libvorbis \ --enable-libx264 --enable-libxvid \ --with-bindings="perl, python" echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro qmake mythtv.pro # Insert rpm version-release for mythbackend --version output find . -name version.pro | xargs perl -pi -e 's|svnversion \$\${SVNTREEDIR}|echo "%{version}-%{release}"|g' make %{?_smp_mflags} cd .. mkdir temp temp=`pwd`/temp make -C mythtv-%{version} install INSTALL_ROOT=$temp export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$temp%{_libdir} cd mythplugins-%{version} ./configure \ --prefix=${temp}%{_prefix} \ --libdir-name=%{_lib} \ --enable-opengl \ --enable-mytharchive \ --enable-create-dvd \ --enable-create-archive \ --enable-mythbrowser \ --enable-mythcontrols \ --enable-mythflix \ --enable-mythgallery \ --enable-exif \ --enable-new-exif \ --enable-mythgame \ --enable-mythmovies \ --enable-mythmusic \ --enable-libvisual \ --enable-fftw \ --enable-sdl \ --enable-aac \ --enable-mythnews \ --enable-mythphone \ %if %with_festival --enable-festival \ %endif --enable-mythvideo \ --enable-mythweather \ --enable-mythzoneminder qmake mythplugins.pro make %{?_smp_mflags} cd .. %install rm -rf %{buildroot} cd mythtv-%{version} make install INSTALL_ROOT=%{buildroot} ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv mkdir -p %{buildroot}%{_localstatedir}/log/mythtv mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/mythtv # Fix permissions on executable python bindings chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth{DB,TV}.py install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/ echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml install -p -m 755 mythbackend.init %{buildroot}%{_sysconfdir}/init.d/mythbackend install -p -m 644 mythbackend.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mythbackend install -p -m 644 mythbackend.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend # Desktop entries mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/applications for file in %{desktop_applications}; do install -p $file.png %{buildroot}%{_datadir}/pixmaps/$file.png desktop-file-install --vendor %{desktop_vendor} \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora-Extra \ --add-category Application \ --add-category AudioVideo \ $file.desktop done mkdir -p %{buildroot}%{_libdir}/mythtv/plugins mkdir -p %{buildroot}%{_datadir}/mythtv/build/ install -p -m 644 settings.pro %{buildroot}%{_datadir}/mythtv/build/ cd .. cd mythplugins-%{version} make install INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo mkdir -p %{buildroot}%{_localstatedir}/lib/pictures mkdir -p %{buildroot}%{_datadir}/mythtv/games/nes/{roms,screens} mkdir -p %{buildroot}%{_datadir}/mythtv/games/snes/{roms,screens} #mkdir -p %{buildroot}%{_datadir}/mythtv/games/mame/{roms,screens,flyers,cabs} mkdir -p %{buildroot}%{_datadir}/mythtv/games/PC/screens mkdir -p %{buildroot}%{_datadir}/mame ln -s ../../mame %{buildroot}%{_datadir}/mythtv/games/xmame mkdir -p %{buildroot}%{_datadir}/mame/flyers ln -s snap %{buildroot}%{_datadir}/mythtv/games/xmame/screens mkdir -p %{buildroot}%{_sysconfdir}/mythgame cp -a mythgame/gamelist.xml %{buildroot}%{_sysconfdir}/mythgame/ ln -s ../../../../../%{_sysconfdir}/mythgame/ \ %{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml cd mythweb mkdir -p %{buildroot}%{_datadir}/mythweb cp -a * %{buildroot}%{_datadir}/mythweb/ mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions} # fix up permissions chmod -R g-x %{buildroot}%{_datadir}/mythweb mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/ # drop .htaccess file, settings handled in the above rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess cd .. cd .. %clean rm -rf %{buildroot} %pre backend # Add the "mythtv" user /usr/sbin/useradd -c "mythtvbackend User" \ -s /sbin/nologin -r -d %{_localstatedir}/lib/mythtv mythtv 2> /dev/null || : %post -n libmyth -p /sbin/ldconfig %postun -n libmyth -p /sbin/ldconfig %post backend /sbin/chkconfig --add mythbackend %preun backend if [ $1 = 0 ]; then /sbin/service mythbackend stop > /dev/null 2>&1 /sbin/chkconfig --del mythbackend fi %files %defattr(-,root,root,-) %files docs %defattr(-,root,root,-) %doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING %doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ %doc mythtv-%{version}/database mythtv-%{version}/keys.txt %doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png %doc mythtv-%{version}/docs/*.txt mythtv-%{version}/contrib %doc mythtv-%{version}/PACKAGE-LICENSING %files common %defattr(-,root,root,-) %dir %{_sysconfdir}/mythtv %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml %{_bindir}/mythcommflag %{_bindir}/mythtranscode %files backend %defattr(-,root,root,-) %{_bindir}/mythbackend %{_bindir}/mythfilldatabase %{_bindir}/mythjobqueue %{_bindir}/mythreplex %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv %attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv %{_sysconfdir}/init.d/mythbackend %config(noreplace) %{_sysconfdir}/sysconfig/mythbackend %config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend %attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv %files setup %defattr(-,root,root,-) %{_bindir}/mythtv-setup %{_bindir}/mythtvsetup %{_datadir}/mythtv/setup.xml %{_datadir}/applications/*mythtv-setup.desktop %files frontend %defattr(-,root,root,-) %{_datadir}/mythtv/devicemaster.xml %{_datadir}/mythtv/deviceslave.xml %{_datadir}/mythtv/CDS_scpd.xml %{_datadir}/mythtv/CMGR_scpd.xml %{_datadir}/mythtv/MSRR_scpd.xml %{_datadir}/mythtv/info_menu.xml %{_datadir}/mythtv/info_settings.xml %{_datadir}/mythtv/library.xml %{_datadir}/mythtv/main_settings.xml %{_datadir}/mythtv/mainmenu.xml %{_datadir}/mythtv/manage_recordings.xml %{_datadir}/mythtv/media_settings.xml %{_datadir}/mythtv/optical_menu.xml %{_datadir}/mythtv/recpriorities_settings.xml %{_datadir}/mythtv/setup.xml %{_datadir}/mythtv/tv_lists.xml %{_datadir}/mythtv/tv_schedule.xml %{_datadir}/mythtv/tv_search.xml %{_datadir}/mythtv/tv_settings.xml %{_datadir}/mythtv/tvmenu.xml %{_datadir}/mythtv/util_menu.xml %{_bindir}/mythfrontend %{_bindir}/mythtv %{_bindir}/mythtvosd %{_bindir}/mythlcdserver %{_bindir}/mythshutdown %{_bindir}/mythwelcome %{_libdir}/mythtv/filters %dir %{_libdir}/mythtv/plugins %{_datadir}/mythtv/*.ttf %dir %{_datadir}/mythtv/i18n %{_datadir}/mythtv/i18n/mythfrontend_*.qm %{_datadir}/applications/*mythfrontend.desktop %{_datadir}/pixmaps/myth*.png %files base-themes %defattr(-,root,root,-) %dir %{_datadir}/mythtv/themes %{_datadir}/mythtv/themes/* %files -n libmyth %defattr(-,root,root,-) %{_libdir}/*.so.* %files -n libmyth-devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %exclude %{_libdir}/*.a %{_datadir}/mythtv/build/settings.pro %files -n mythplugins %defattr(-,root,root,-) %doc mythplugins-%{version}/COPYING %files -n mythmovies %defattr(-,root,root,-) %doc mythplugins-%{version}/mythmovies/COPYING %doc mythplugins-%{version}/mythmovies/README %doc mythplugins-%{version}/mythmovies/TODO %{_bindir}/ignyte %{_datadir}/mythtv/themes/default/movies-ui.xml %{_libdir}/mythtv/plugins/libmythmovies.so %files -n mythmusic %defattr(-,root,root,-) %doc mythplugins-%{version}/mythmusic/AUTHORS %doc mythplugins-%{version}/mythmusic/COPYING %doc mythplugins-%{version}/mythmusic/README %{_libdir}/mythtv/plugins/libmythmusic.so %{_localstatedir}/lib/mythmusic %{_datadir}/mythtv/musicmenu.xml %{_datadir}/mythtv/music_settings.xml %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/i18n/mythmusic_*.qm %files -n mythvideo %defattr(-,root,root,-) %doc mythplugins-%{version}/mythvideo/COPYING %doc mythplugins-%{version}/mythvideo/README* %{_libdir}/mythtv/plugins/libmythvideo.so %{_datadir}/mythtv/mythvideo %{_datadir}/mythtv/i18n/mythvideo_*.qm %{_datadir}/mythtv/video_settings.xml %{_datadir}/mythtv/videomenu.xml %{_localstatedir}/lib/mythvideo %{_bindir}/mtd %files -n mythweather %defattr(-,root,root,-) %doc mythplugins-%{version}/mythweather/AUTHORS %doc mythplugins-%{version}/mythweather/COPYING %doc mythplugins-%{version}/mythweather/README %{_libdir}/mythtv/plugins/libmythweather.so %{_datadir}/mythtv/i18n/mythweather_*.qm %{_datadir}/mythtv/weather_settings.xml %{_datadir}/mythtv/mythweather %files -n mythgallery %defattr(-,root,root,-) %doc mythplugins-%{version}/mythgallery/AUTHORS %doc mythplugins-%{version}/mythgallery/COPYING %doc mythplugins-%{version}/mythgallery/README %{_libdir}/mythtv/plugins/libmythgallery.so %{_datadir}/mythtv/i18n/mythgallery_*.qm %{_localstatedir}/lib/pictures %files -n mythgame %defattr(-,root,root,-) %dir %{_sysconfdir}/mythgame %config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml %{_libdir}/mythtv/plugins/libmythgame.so %{_datadir}/mythtv/games %exclude %{_datadir}/mythtv/games/xmame %{_datadir}/mythtv/game_settings.xml %{_datadir}/mythtv/i18n/mythgame_*.qm %files -n mythgame-emulators %defattr(-,root,root,-) %{_datadir}/mythtv/games/xmame %{_datadir}/mame/screens %{_datadir}/mame/flyers %files -n mythnews %defattr(-,root,root,-) %doc mythplugins-%{version}/mythnews/AUTHORS %doc mythplugins-%{version}/mythnews/COPYING %doc mythplugins-%{version}/mythnews/README %{_libdir}/mythtv/plugins/libmythnews.so %{_datadir}/mythtv/mythnews %{_datadir}/mythtv/i18n/mythnews_*.qm %files -n mythbrowser %defattr(-,root,root,-) %doc mythplugins-%{version}/mythbrowser/AUTHORS %doc mythplugins-%{version}/mythbrowser/COPYING %doc mythplugins-%{version}/mythbrowser/README %{_bindir}/mythbrowser %{_libdir}/mythtv/plugins/libmythbookmarkmanager.so %{_datadir}/mythtv/i18n/mythbrowser_*.qm %files -n mythphone %defattr(-,root,root,-) %doc mythplugins-%{version}/mythphone/AUTHORS %doc mythplugins-%{version}/mythphone/COPYING %doc mythplugins-%{version}/mythphone/README %doc mythplugins-%{version}/mythphone/TODO %{_libdir}/mythtv/plugins/libmythphone.so %{_datadir}/mythtv/i18n/mythphone_*.qm %files -n mythcontrols %defattr(-,root,root,-) %doc mythplugins-%{version}/mythcontrols/AUTHORS %doc mythplugins-%{version}/mythcontrols/COPYING %doc mythplugins-%{version}/mythcontrols/README %doc mythplugins-%{version}/mythcontrols/TODO %{_libdir}/mythtv/plugins/libmythcontrols.so %{_datadir}/mythtv/i18n/mythcontrols_*.qm %files -n mythflix %defattr(-,root,root,-) %doc mythplugins-%{version}/mythflix/AUTHORS %doc mythplugins-%{version}/mythflix/COPYING %doc mythplugins-%{version}/mythflix/README %{_libdir}/mythtv/plugins/libmythflix.so %{_datadir}/mythtv/mythflix %{_datadir}/mythtv/i18n/mythflix_*.qm %{_datadir}/mythtv/i18n/mythflix_*.ts %{_datadir}/mythtv/netflix_menu.xml %files -n mytharchive %defattr(-,root,root,-) %doc mythplugins-%{version}/mytharchive/AUTHORS %doc mythplugins-%{version}/mytharchive/COPYING %doc mythplugins-%{version}/mytharchive/README %doc mythplugins-%{version}/mytharchive/TODO %{_bindir}/mytharchivehelper %{_libdir}/mythtv/plugins/libmytharchive.so %{_datadir}/mythtv/archiveformat.xml %{_datadir}/mythtv/archivemenu.xml %{_datadir}/mythtv/archiveutils.xml %{_datadir}/mythtv/mytharchive %{_datadir}/mythtv/i18n/mytharchive_*.qm %files -n mythzoneminder %defattr(-,root,root,-) %{_libdir}/mythtv/plugins/libmythzoneminder.so %{_datadir}/mythtv/zonemindermenu.xml %{_bindir}/mythzmserver %files -n mythweb %defattr(-,root,root,-) %doc mythplugins-%{version}/mythweb/README %config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf %defattr(-,apache,apache,0775) %dir %{_datadir}/mythweb %{_datadir}/mythweb/* %files -n perl-MythTV %defattr(-,root,root,-) %{perl_vendorlib}/MythTV.pm %dir %{perl_vendorlib}/MythTV %{perl_vendorlib}/MythTV/*.pm %{perl_vendorlib}/IO/Socket/INET/MythTV.pm %exclude %{perl_vendorarch}/auto/MythTV/.packlist %files -n python-MythTV %defattr(-,root,root,-) %dir %{python_sitelib}/MythTV/ %{python_sitelib}/MythTV/* %if 0%{?fedora} >= 9 %{python_sitelib}/MythTV-*.egg-info %endif %changelog * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8 - Don't BR: libdvdcss-devel - Update release-0-21-fixes patches (r18161) - Rebuild for libraw1394 v2.0.0 * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7 - rebuild * Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7 - Disable XvMC VLD and Pro support on ppc due to lack of openchrome driver. * Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6 - Fix spec typo - Disable mythstream patch for now, too much fuzz, revisit later * Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5 - Update release-0-21-fixes patches (r17859) - Don't use %%bcond, breaks on some older buildsystems - Put several bits in -common sub-package, as both backend and frontend may need them for one reason or another * Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4 - Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel - Make building with nVidia XvMC an available custom option, fix up conflict between it and other XvMC implementations - Update release-0-21-fixes patches (r17338) * Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3 - Fix up PACKAGE-LICENSING inclusion * Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2 - RPMFusion package review cleanups - Put mythtv-setup.desktop in mythtv-setup package - Fix up initscript to start properly - Drop unused %%ghostattr define - Attempt to clarify licensing - Clean up assorted Requires and BuildRequires - Update release-0-21-fixes patches (r16965) * Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1 - MythTV 0.21 (r16468) - Add release-0-21-fixes for DVD menu display fix (r16486) * Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394 - Update to latest release-0-21-fixes pre-release branch code (16394). * Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316 - Update to latest release-0-21-fixes pre-release branch code (16316). - Add mythgame-emulators meta-package that requires a bunch of emulators for roms mythgame knows about. - Account for python egg on f9+ - Enable gsm support by default * Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307 - Update to latest release-0-21-fixes pre-release branch code (16307). - Try to fix up a bunch of rpmlint warnings and errors. * Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238 - Update to latest svn trunk (16238). - Package up python bits. * Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019 - Update to latest svn trunk (16019). * Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914 - Update to latest svn trunk (15914). - Turn on multi-threaded video decoding. * Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699 - More spec file overhauling, make it build in Fedora 9 * Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699 - Update to latest svn trunk (15699). - Misc spec reformatting. * Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614 - Update to latest svn trunk (15614). * Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281 - Update to latest svn trunk (15281). - Fix up version-release insertion in mythbackend --version output * Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081 - Update to latest svn trunk (15081). * Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888 - Update to latest svn trunk (14888). * Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695 - Update to latest svn trunk (14695). * Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667 - Update to latest svn trunk (14667). - Build dvb support against kernel-headers instead - Drop unnecessary patches - Tweak BR: to not use any file deps (I only care about recent distros) - Rework mythweb bits to be compliant w/Fedora packaging guidelines - Enable OpenGL video output support - Make dvb and opengl bits non-conditional (always enabled) * Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658 - Update to latest svn trunk (14658). - Tweak configure options a bit more * Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589 - Update to latest svn trunk (14589). - Restructure how optflags are passed into build - Nuke some extra non-standard macros - Drop ancient dvb tarball, create with_dvb option, always using v4l-devel * Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488 - Update to latest svn trunk (14488). * Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346 - Update to latest svn trunk (14346). * Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337 - Update to latest svn trunk (14337). * Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492 - Update to latest svn trunk (13492). - More non-standard macro nuking * Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487 - Update to latest svn trunk (13487). - Reshuffle theme files - Credit where credit is due: forking this off the current ATrpms spec --- NEW FILE mythweb.conf --- # # Apache configuration directives for MythWeb. Please read INSTALL for setup # requirements and troubleshooting, along with the comments in this file. # # # CHANGE THIS PATH TO MATCH YOUR MYTHWEB INSTALLATION DIRECTORY! e.g. # # /var/www # /home/www/htdocs # /var/www/html/mythweb # /srv/www/htdocs/mythweb # Alias /mythweb/ "/usr/share/mythweb/" <Directory "/usr/share/mythweb"> ############################################################################ # I *strongly* urge you to turn on authentication for MythWeb. It is disabled # by default because it requires you to set up your own password file. Please # see the man page for htdigest and then configure the folowing four directives # to suit your authentication needs. # # AuthType Digest # AuthName "MythWeb" # AuthUserFile /etc/httpd/conf.d/mythweb-htdigest # Require valid-user # BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On # Order allow,deny # Satisfy any # # * If you're running Apache earlier than 2.2, you will need to use # the AuthDigestFile command instead of AuthUserFile (3rd line above). # ############################################################################ # Some special instructions for the MythWeb controller files # <Files mythweb.*> # # Use the following environment settings to tell MythWeb where you want it to # look to connect to the database, the name of the database to connect to, and # the authentication info to use to connect. The defaults will usually work # fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on # a different server from your main backend. Make sure you have mod_env enabled. # setenv db_server "localhost" setenv db_name "mythconverg" setenv db_login "mythtv" setenv db_password "mythtv" # # By default, MythWeb uses the hostname program to look up the hostname of the # machine it runs on. If this reports incorrect data, or you run MythWeb on a # machine without the hostname program, set this to your current hostname. # # setenv hostname "my_mythbox" # # By default, php will always search the current directory for include files, # but if you wish to install these directories outside of the current path # (eg. for security reasons), set this variable to the directory that # contains the directories like languages and templates. eg. # # setenv include_path "/usr/share/mythweb" # If you want MythWeb to email php/database errors (and a backtrace) to you, # uncomment and set the email address below. # # setenv error_email "mythweb_errors(a)example.com" # # If your local file system is something other than UTF-8, set this variable # so that the music and video portions of MythWeb can provide proper links # to your downloadable files. # # setenv fs_encoding "ISO-8859-1" </Files> ############################################################################ # The following settings relate to PHP config. # <Files *.php> # These settings are intended for apache 2.x. If your version of apache # doesn't support php_value, or things like memory_limit aren't working # as expected, then use these settings as examples for your own php.ini # files. php_value safe_mode 0 php_value memory_limit 32M php_value register_globals 0 php_value magic_quotes_gpc 0 php_value file_uploads 0 php_value allow_url_fopen On php_value zlib.output_handler Off php_value output_handler NULL # Note: php_flag does not work in older versions of php php_flag output_handler "NULL" </Files> ############################################################################ # The settings below relate specifically to mod_rewrite and the rewrite # engine used to make the MythWeb user experience a little easier to deal # with by simplifying the URLs needed to access the various sections. Do # not touch these settings unless you really know what you're doing.. # # Turn on the rewrite engine RewriteEngine on # If MythWeb is installed outside of the document root (eg. using Alias) then # you will need to set this directive to the base URL that MythWeb is visible # from externally. If you do not, the web server will return 'not found'. RewriteBase /mythweb # Skip out early if we've already been through rewrites, # or if this is a /css/, /js/ or /cache/ directory request. RewriteRule ^(css|data|images|js|themes|skins|[a-z_]+\.(php|pl))(/|$) - [L] # Redirect /pl/ requests to the perl cgi handler. RewriteRule ^(pl(/.*)?)$ mythweb.pl/$1 [QSA,L] # Redirect most of the remaining URL requests to the main mythweb script. # It will then handle any requests given to it. RewriteRule ^(.+)$ mythweb.php/$1 [QSA,L] # If you're experiencing trouble with the previous two lines in your copy of # apache, you could instead use something like: # RewriteRule ^(pl(/.*)?)$ mythweb.pl?PATH_INFO=/$1 [L,QSA] # RewriteRule ^(.+)$ mythweb.php?PATH_INFO=/$1 [L,QSA] # Catch anything else that comes through and send it to mythweb.php with no parameters. RewriteRule ^(.*)$ mythweb.php [QSA,L] ############################################################################ # You really shouldn't need to edit anything below this line, so please # don't unless you know what you're doing. # # Allow .htaccess to override whatever it wants from the server config. AllowOverride All # Allow browsers to follow symlinks that point outside of the web document # tree. This is how we access music, videos, etc. Options FollowSymLinks # MythTV now uses the correct file suffix for mpeg files, so all .nuv files # should actually be NuppleVideo. However, apache probably doesn't know what # those are, so we should tell it. AddType video/nuppelvideo .nuv # Specify the MIME type for favicon.ico in case the server configuration # doesn't or in case the server configuration uses the IANA-approved MIME type # (image/vnd.microsoft.icon)--which most browsers won't recognize. AddType image/x-icon .ico # Enable mod_deflate. This works MUCH more reliably than PHP's built-in # gzip/Zlib compressors. It is disabled here because many distros seem not # to enable mod_deflate by default, but I strongly recommend that you # enable this section. # BrowserMatch ^Mozilla/4 gzip-only-text/html BrowserMatch ^Mozilla/4\.0[678] no-gzip BrowserMatch \bMSIE !no-gzip !gzip-only-text/html # AddOutputFilterByType DEFLATE text/html AddOutputFilterByType DEFLATE text/css AddOutputFilterByType DEFLATE application/x-javascript # This is helpful for mod_deflate -- it prevents proxies from changing # the user agent to/from this server, which can prevent compression from # being enabled. It is disabled here because many distros seem not to # enable mod_headers by default, but I recommend that you enable it. # Header append Vary User-Agent env=!dont-vary # Set up the perl handler so we can stream properly. # # IMPORTANT!! Please see the note in INSTALL section 5.1 that explains why # this may not always properly detect mod_perl. # <Files *.pl> <IfModule mod_perl.c> SetHandler perl-script PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders </IfModule> <IfModule !mod_perl.c> SetHandler cgi-script </IfModule> Options +ExecCGI </Files> </Directory> <Directory "/usr/share/mythweb/data"> Options -All +FollowSymLinks +IncludesNoExec </Directory> # You will probably also want to uncomment the following rules, which # disable authentication for MythWeb's download URLs so you can properly # stream to media players that don't work with authenticated servers. # <LocationMatch .*/pl/stream/[0-9]+/[0-9]+> Allow from all </LocationMatch> <LocationMatch .*/music/stream.php> Allow from all </LocationMatch> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:54:04 -0000 1.1 +++ .cvsignore 3 Sep 2008 14:59:46 -0000 1.2 @@ -0,0 +1,4 @@ +mythfrontend.png +mythtv-setup.png +mythplugins-0.21.tar.bz2 +mythtv-0.21.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:54:04 -0000 1.1 +++ sources 3 Sep 2008 14:59:46 -0000 1.2 @@ -0,0 +1,4 @@ +be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png +be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png +6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2 +49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2

16 years, 2 months

1
0
0 / 0

rpms/freetype-freeworld/devel .cvsignore, 1.2, 1.3 freetype-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3

by Kevin Kofler

Author: kkofler Update of /cvs/free/rpms/freetype-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1888/devel Modified Files: .cvsignore freetype-freeworld.spec sources Log Message: * Tue Sep 02 2008 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.7-1 - Update to 2.3.7 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/freetype-freeworld/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Aug 2008 21:24:59 -0000 1.2 +++ .cvsignore 3 Sep 2008 12:02:10 -0000 1.3 @@ -1 +1 @@ -freetype-2.3.6.tar.bz2 +freetype-2.3.7.tar.bz2 Index: freetype-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freetype-freeworld.spec 9 Aug 2008 21:24:59 -0000 1.1 +++ freetype-freeworld.spec 3 Sep 2008 12:02:10 -0000 1.2 @@ -7,8 +7,8 @@ Summary: A free and portable font rendering engine Name: freetype-freeworld -Version: 2.3.6 -Release: 2%{?dist} +Version: 2.3.7 +Release: 1%{?dist} License: FTL or GPLv2+ Group: System Environment/Libraries URL: http://www.freetype.org @@ -122,6 +122,9 @@ %config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf %changelog +* Tue Sep 02 2008 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.7-1 +- Update to 2.3.7 + * Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.3.6-2 - rebuild for RPM Fusion Index: sources =================================================================== RCS file: /cvs/free/rpms/freetype-freeworld/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Aug 2008 21:24:59 -0000 1.2 +++ sources 3 Sep 2008 12:02:10 -0000 1.3 @@ -1 +1 @@ -fb182d508017cb608e9df8c7dca648dc freetype-2.3.6.tar.bz2 +83306194817ebdea554133b4232a34aa freetype-2.3.7.tar.bz2

16 years, 2 months

1
0
0 / 0

rpms/gens/F-8 .cvsignore,1.3,1.4 gens.spec,1.2,1.3 sources,1.3,1.4

by Andrea Musuruane

Author: musuruan Update of /cvs/nonfree/rpms/gens/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13675 Modified Files: .cvsignore gens.spec sources Log Message: * Tue Sep 02 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.4-1 - updated to upstream 2.15.4 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Aug 2008 20:09:26 -0000 1.3 +++ .cvsignore 2 Sep 2008 19:08:23 -0000 1.4 @@ -1 +1 @@ -gens-2.15.3.tar.gz +gens-2.15.4.tar.gz Index: gens.spec =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-8/gens.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gens.spec 24 Aug 2008 20:09:26 -0000 1.2 +++ gens.spec 2 Sep 2008 19:08:23 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Gens is a win32/unix Sega Genesis / Sega CD / Sega 32X emulator Name: gens -Version: 2.15.3 +Version: 2.15.4 Release: 1%{?dist} License: GPLv2 Group: Applications/Emulators @@ -19,9 +19,6 @@ BuildRequires: nasm >= 0.98.37 BuildRequires: ImageMagick BuildRequires: desktop-file-utils -# Autoconf and automake required from v2.15.3 -BuildRequires: autoconf -BuildRequires: automake Requires: hicolor-icon-theme %description @@ -44,12 +41,6 @@ mv gens.txt.utf8 gens.txt %build -# Autoconf and automake required from v2.15.3 -aclocal -autoheader -autoconf -automake -Wno-portability -#autoconf %configure make %{?_smp_mflags} @@ -94,6 +85,9 @@ %doc AUTHORS BUGS COPYING gens.txt history.txt README %changelog +* Tue Sep 02 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.4-1 +- updated to upstream 2.15.4 + * Sun Aug 23 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.3-1 - updated to upstream 2.15.3 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Aug 2008 20:09:26 -0000 1.3 +++ sources 2 Sep 2008 19:08:23 -0000 1.4 @@ -1 +1 @@ -da8057c70a0858c301f428d97e95b08a gens-2.15.3.tar.gz +979f093ddc9aae579a0b8e96055bbddf gens-2.15.4.tar.gz

16 years, 2 months

1
0
0 / 0

rpms/gens/F-9 .cvsignore,1.3,1.4 gens.spec,1.2,1.3 sources,1.3,1.4

by Andrea Musuruane

Author: musuruan Update of /cvs/nonfree/rpms/gens/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13552 Modified Files: .cvsignore gens.spec sources Log Message: * Tue Sep 02 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.4-1 - updated to upstream 2.15.4 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-9/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Aug 2008 20:08:45 -0000 1.3 +++ .cvsignore 2 Sep 2008 19:07:28 -0000 1.4 @@ -1 +1 @@ -gens-2.15.3.tar.gz +gens-2.15.4.tar.gz Index: gens.spec =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-9/gens.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gens.spec 24 Aug 2008 20:08:45 -0000 1.2 +++ gens.spec 2 Sep 2008 19:07:29 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Gens is a win32/unix Sega Genesis / Sega CD / Sega 32X emulator Name: gens -Version: 2.15.3 +Version: 2.15.4 Release: 1%{?dist} License: GPLv2 Group: Applications/Emulators @@ -19,9 +19,6 @@ BuildRequires: nasm >= 0.98.37 BuildRequires: ImageMagick BuildRequires: desktop-file-utils -# Autoconf and automake required from v2.15.3 -BuildRequires: autoconf -BuildRequires: automake Requires: hicolor-icon-theme %description @@ -44,12 +41,6 @@ mv gens.txt.utf8 gens.txt %build -# Autoconf and automake required from v2.15.3 -aclocal -autoheader -autoconf -automake -Wno-portability -#autoconf %configure make %{?_smp_mflags} @@ -94,6 +85,9 @@ %doc AUTHORS BUGS COPYING gens.txt history.txt README %changelog +* Tue Sep 02 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.4-1 +- updated to upstream 2.15.4 + * Sun Aug 23 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.15.3-1 - updated to upstream 2.15.3 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-9/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Aug 2008 20:08:45 -0000 1.3 +++ sources 2 Sep 2008 19:07:29 -0000 1.4 @@ -1 +1 @@ -da8057c70a0858c301f428d97e95b08a gens-2.15.3.tar.gz +979f093ddc9aae579a0b8e96055bbddf gens-2.15.4.tar.gz

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2008