Przesyłam uaktualnienie do wersji 2.0.1 - poprawka do spec'a i dwie
zaadaptowane łatki (pozostałe dwie bez zmian). Testowałem i jest OK. Może
ktoś rzucić okiem i ewentualnie commitnąć?
W listopadzie 2004 projekt zmienił nazwę na "XdTV", zatem może być zasadna
zmiana nazwy spec'a.
--
|## ( [EMAIL PROTECTED] ) # # # ( Piotr Czapski ) ##|
|## GG933355 # petec[at]petec[dot]one[dot]pl ##|
|# # # # JID: [EMAIL PROTECTED] # # # # # # # # #|
--- xawdecode-1.9.2/font/Makefile.in.orig 2003-12-08 21:11:20.000000000 +0100
+++ xawdecode-1.9.2/font/Makefile.in 2004-08-22 13:33:43.025306560 +0200
@@ -1,7 +1,6 @@
-ROOT=
prefix=/usr/X11R6
#FONTDIR=$(ROOT)$(prefix)/lib/X11/fonts/misc
-FONTDIR=$(ROOT)/@x_libraries@/X11/fonts/misc
+FONTDIR=/usr/share/fonts/misc
BDF=$(shell echo *.bdf)
PCF=$(subst .bdf,.pcf,$(BDF))
@@ -9,15 +8,10 @@
$(MKFONTDIR)
install: all
- mkdir -p $(R)$(DESTDIR)$(FONTDIR)
+ mkdir -p $(DESTDIR)$(FONTDIR)
for file in $(PCF); do \
- install -m 644 $$file $(R)$(DESTDIR)$(FONTDIR); \
+ install -m 644 $$file $(DESTDIR)$(FONTDIR); \
done
- if test "$(ROOT)" = ""; then \
- (cd $(FONTDIR); $(MKFONTDIR)); \
- xset fp rehash; \
- true; \
- fi
uninstall:
# for file in $(PCF); do \
--- xawdecode-1.9.2/src/Makefile.am.orig 2004-06-18 20:12:33.000000000 +0200
+++ xawdecode-1.9.2/src/Makefile.am 2004-08-22 13:34:00.074118781 +0200
@@ -97,9 +97,6 @@
xdtv_wizard_SOURCES = xdtv_wizard.c
xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @LIBXMU@ @LIBXT@ @LIBXPM@ @LIBXEXT@ -lX11
-install-exec-local:
- chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf
-
xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@
xdtv_scantv_SOURCES = xdtv_scantv.c grab-v4l.c grab-v4l2.c strtab.c colorspace.c frequencies.c
Index: xawdecode.spec
===================================================================
RCS file: /cvsroot/SPECS/xawdecode.spec,v
retrieving revision 1.25
diff -u -r1.25 xawdecode.spec
--- xawdecode.spec 9 Sep 2004 22:21:04 -0000 1.25
+++ xawdecode.spec 4 Jan 2005 22:05:43 -0000
@@ -6,11 +6,11 @@
Summary: Video4Linux Stream Capture Viewer
Summary(pl): Program do oglądania strumienia z Video4Linux
Name: xawdecode
-Version: 1.9.2
+Version: 2.0.1
Release: 1
License: GPL
Group: X11/Applications/Multimedia
-Source0: http://dl.sourceforge.net/xawdecode/%{name}-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/xawdecode/xdtv-%{version}.tar.bz2
# Source0-md5: 0d17f30e6600684aa297d22311789e87
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-opt.patch
@@ -54,7 +54,7 @@
Pliki do programowania z użyciem xawdecode.
%prep
-%setup -q
+%setup -q -n xdtv-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -96,22 +96,22 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQfr-xawdecode libavc-rate-control.txt
+%doc AUTHORS ChangeLog FAQfr-xdtv libavc-rate-control.txt
%doc lircrc.hauppauge.sample lircrc.miro.sample lisez-moi README*
-%doc xawdecoderc.sample
-%config(noreplace) %verify(not md5 size mtime) /etc/xawdecode*
-%attr(755,root,root) %{_bindir}/xawdecode
-%attr(755,root,root) %{_bindir}/xawdecode_[a-uw]*
-%attr(4755,root,root) %{_bindir}/xawdecode_v4l-conf
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/icons
+%doc xdtvrc.sample
+%config(noreplace) %verify(not md5 size mtime) /etc/xdtv*
+%attr(755,root,root) %{_bindir}/xdtv
+%attr(755,root,root) %{_bindir}/xdtv_[a-uw]*
+%attr(4755,root,root) %{_bindir}/xdtv_v4l-conf
+%dir %{_datadir}/xdtv
+%{_datadir}/xdtv/icons
%{_appdefsdir}/*
%{_mandir}/man1/*
%{_fontsdir}/misc/*.pcf
%files devel
%defattr(644,root,root,755)
-%{_includedir}/xawdecode
+%{_includedir}/xdtv
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
--- xawdecode-1.9.2/alevt/Makefile.am.orig 2004-03-31 00:05:15.000000000 +0200
+++ xawdecode-1.9.2/alevt/Makefile.am 2004-08-22 13:39:16.349496110 +0200
@@ -83,7 +83,7 @@
# AM_CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
#AM_CFLAGS = -DVERSION=\"$(VER)\" @CFLAGS@ @X_CFLAGS@
-AM_CFLAGS = @CFLAGPTHREAD@ $(OPT) -D_REENTRANT -DVERSION=\"$(VER)\" @X_CFLAGS@
+AM_CFLAGS = @CFLAGPTHREAD@ -D_REENTRANT -DVERSION=\"$(VER)\" @X_CFLAGS@
#INCLUDES = -I/usr/local/include
libalevt_a_DEPENDENCIES = bdf2xbm font1.xbm font2.xbm font3.xbm font4.xbm fontsize.h
--- xawdecode-1.9.2/configure.in.orig 2004-06-19 23:07:37.000000000 +0200
+++ xawdecode-1.9.2/configure.in 2004-08-22 13:34:46.046828131 +0200
@@ -911,8 +911,6 @@
AC_MSG_RESULT($xvid_header_ok)
if test x"$xvid_header_ok" = xno; then
AC_MSG_WARN(*** Could not find XviD header files ***)
- else
- CFLAGS="$saved_CFLAGS"
fi
@@ -987,8 +985,6 @@
AC_MSG_RESULT($libavcodec_header_ok)
if test x"$libavcodec_header_ok" = xno; then
AC_MSG_WARN(*** Could not find libavcodec (ffmpeg) header files ***)
- else
- CFLAGS="$saved_CFLAGS"
fi
@@ -1031,8 +1027,6 @@
AC_MSG_RESULT($divx_header_ok)
if test x"$divx_header_ok" = xno; then
AC_MSG_WARN(*** Could not find divx4linux header files ***)
- else
- CFLAGS="$saved_CFLAGS"
fi
@@ -1091,8 +1085,6 @@
if test x"$lame_header_ok" = xno; then
AC_MSG_WARN(*** Could not find lame header files ***)
enable_lame=no
- else
- CFLAGS="$saved_CFLAGS"
fi
fi
--- xawdecode-1.9.2/src/Makefile.am.orig 2004-08-22 13:34:46.043828867 +0200
+++ xawdecode-1.9.2/src/Makefile.am 2004-08-22 13:40:24.034899886 +0200
@@ -81,7 +81,7 @@
DISTCLEANFILES=*~ *.log
-PERF_FLAGS=-O4 @_march@ -fstrength-reduce -frerun-loop-opt -fexpensive-optimizations -fschedule-insns2 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -pipe @ALIGN_FLAGS@ -ffast-math
+PERF_FLAGS=-fno-strict-aliasing -pipe @ALIGN_FLAGS@ -ffast-math
AM_CFLAGS = @CFLAGPTHREAD@ @DEBUG@ -Wall -D_REENTRANT $(PERF_FLAGS) @X_CFLAGS@ @LIBXOSD_CFLAGS@ -DPREFIX='"$(prefix)"' -D_LARGEFILE64_SOURCE
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
