rpms/libmss - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/libmss
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/tmpcvspk6814/rpms/libmss
Log Message:
Directory /cvs/free/rpms/libmss added to the repository
16 years, 2 months
rpms/ffmpeg/devel .cvsignore, 1.3, 1.4 ffmpeg-snapshot.sh, 1.1, 1.2 ffmpeg.spec, 1.2, 1.3 sources, 1.3, 1.4
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21371
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources
Log Message:
* Fri Sep 05 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080905
- 20080905 snapshot
- fix build --with amr
- update snapshot.sh
- drop liba52 support, native ac3 decoder is better in every way
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 26 Aug 2008 00:49:17 -0000 1.3
+++ .cvsignore 5 Sep 2008 15:17:52 -0000 1.4
@@ -1 +1 @@
-ffmpeg-20080825.tar.bz2
+ffmpeg-20080905.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-snapshot.sh 3 Aug 2008 14:25:41 -0000 1.1
+++ ffmpeg-snapshot.sh 5 Sep 2008 15:17:52 -0000 1.2
@@ -17,7 +17,7 @@
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
cd ffmpeg-$svn
-./version.sh .
+./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg.spec 26 Aug 2008 00:49:17 -0000 1.2
+++ ffmpeg.spec 5 Sep 2008 15:17:52 -0000 1.3
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%define svn 20080825
+%define svn 20080905
%define faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.48.%{svn}%{?dist}
+Release: 0.49.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
@@ -15,7 +15,6 @@
Patch4: %{name}-asmreg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: a52dec-devel
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: zlib-devel
BuildRequires: lame-devel
@@ -79,9 +78,8 @@
--mandir=%{_mandir} \
--arch=%{_target_cpu} \
--extra-cflags="$RPM_OPT_FLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fno-math-errno" \
- %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \
+ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \
--enable-libdc1394 \
- --enable-liba52 \
--enable-libfaac \
--enable-libfaad \
--enable-libgsm \
@@ -165,6 +163,12 @@
%changelog
+* Fri Sep 05 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080905
+- 20080905 snapshot
+- fix build --with amr
+- update snapshot.sh
+- drop liba52 support, native ac3 decoder is better in every way
+
* Mon Aug 25 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.48.20080825
- 20080825 snapshot
- use CFLAGS more similar to upstream
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 26 Aug 2008 00:49:17 -0000 1.3
+++ sources 5 Sep 2008 15:17:52 -0000 1.4
@@ -1 +1 @@
-c6cbe2517152ad3b47bf44bbc07586ec ffmpeg-20080825.tar.bz2
+29802605e4d20aef1b6b02916877541b ffmpeg-20080905.tar.bz2
16 years, 2 months
rpms/qmmp-plugins-freeworld/devel .cvsignore, 1.2, 1.3 qmmp-plugins-freeworld.spec, 1.2, 1.3 sources, 1.2, 1.3
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13742
Modified Files:
.cvsignore qmmp-plugins-freeworld.spec sources
Log Message:
version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Aug 2008 18:37:17 -0000 1.2
+++ .cvsignore 5 Sep 2008 13:01:04 -0000 1.3
@@ -1 +1 @@
-qmmp-0.2.0.tar.bz2
+qmmp-0.2.2.tar.bz2
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/qmmp-plugins-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qmmp-plugins-freeworld.spec 20 Aug 2008 15:00:09 -0000 1.2
+++ qmmp-plugins-freeworld.spec 5 Sep 2008 13:01:04 -0000 1.3
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
-Version: 0.2.0
-Release: 4%{?dist}
+Version: 0.2.2
+Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -13,7 +13,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.8 libmad-devel qt-devel >= 4.2
+BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.47.20080614 libmad-devel qt-devel >= 4.2
BuildRequires: taglib-devel libcurl-devel
BuildRequires: qmmp = %{version}
Requires: qmmp = %{version}
@@ -35,7 +35,8 @@
-e 's|<avformat.h|<libavformat/avformat.h|g' \
-e 's|g/avformat.h|g/libavformat/avformat.h|g' \
src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \
+ src/plugins/Input/ffmpeg/detailsdialog.cpp
%build
@@ -86,9 +87,12 @@
%changelog
+* Fri Sep 05 2008 Karel Volny <kvolny(a)redhat.com> 0.2.2-1
+- version bump
+
* Wed Aug 20 2008 Karel Volny <kvolny(a)redhat.com> 0.2.0-4
- adjusted includes for the header move in latest ffmpeg
-- upgrade ffmpeg-devel dependency
+- upgraded ffmpeg-devel dependency
* Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.0-3
- rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Aug 2008 18:37:17 -0000 1.2
+++ sources 5 Sep 2008 13:01:04 -0000 1.3
@@ -1 +1 @@
-3dd56fc0c9dd632572465f9eab3e4c80 qmmp-0.2.0.tar.bz2
+363d331d5454750277a7180118cbc62d qmmp-0.2.2.tar.bz2
16 years, 2 months
rpms/qmmp-plugins-freeworld/F-9 qmmp-plugins-freeworld.spec, 1.3, 1.4
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12804
Modified Files:
qmmp-plugins-freeworld.spec
Log Message:
corrected the ffmpeg version problems, finally
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-9/qmmp-plugins-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmmp-plugins-freeworld.spec 20 Aug 2008 15:09:45 -0000 1.3
+++ qmmp-plugins-freeworld.spec 5 Sep 2008 12:45:48 -0000 1.4
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
Version: 0.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -13,7 +13,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: cmake ffmpeg-devel < 0.4.9-0.8 libmad-devel qt-devel >= 4.2
+BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.47.20080614 libmad-devel qt-devel >= 4.2
BuildRequires: taglib-devel libcurl-devel
BuildRequires: qmmp = %{version}
Requires: qmmp = %{version}
@@ -28,6 +28,15 @@
%setup -q -n qmmp-%{version}
cp %{SOURCE2} .
chmod +x qmmp-filter-provides.sh
+# adjust includes for the header move in latest ffmpeg
+sed -i \
+ -e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
+ -e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \
+ -e 's|<avformat.h|<libavformat/avformat.h|g' \
+ -e 's|g/avformat.h|g/libavformat/avformat.h|g' \
+ src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
+ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \
+ src/plugins/Input/ffmpeg/detailsdialog.cpp
%build
@@ -78,6 +87,9 @@
%changelog
+* Fri Sep 05 2008 Karel Volny <kvolny(a)redhat.com> 0.2.0-6
+- corrected the ffmpeg headers issue
+
* Wed Aug 20 2008 Karel Volny <kvolny(a)redhat.com> 0.2.0-5
- reverted previous change, the new ffmpeg is not released in this branch
16 years, 2 months
rpms/qmmp-plugins-freeworld/F-8 qmmp-plugins-freeworld.spec, 1.3, 1.4
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6649
Modified Files:
qmmp-plugins-freeworld.spec
Log Message:
corrected the build issue with ffmpeg from rpmfusion (finally ...)
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-8/qmmp-plugins-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmmp-plugins-freeworld.spec 20 Aug 2008 15:09:13 -0000 1.3
+++ qmmp-plugins-freeworld.spec 5 Sep 2008 12:12:55 -0000 1.4
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
Version: 0.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -13,7 +13,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: cmake ffmpeg-devel < 0.4.9-0.8 libmad-devel qt4-devel >= 4.2
+BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.47.20080614 libmad-devel qt4-devel >= 4.2
BuildRequires: taglib-devel curl-devel
BuildRequires: qmmp = %{version}
Requires: qmmp = %{version}
@@ -28,6 +28,15 @@
%setup -q -n qmmp-%{version}
cp %{SOURCE2} .
chmod +x qmmp-filter-provides.sh
+# adjust includes for the header move in latest ffmpeg
+sed -i \
+ -e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
+ -e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \
+ -e 's|<avformat.h|<libavformat/avformat.h|g' \
+ -e 's|g/avformat.h|g/libavformat/avformat.h|g' \
+ src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
+ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \
+ src/plugins/Input/ffmpeg/detailsdialog.cpp
%build
@@ -78,6 +87,9 @@
%changelog
+* Fri Sep 05 2008 Karel Volny <kvolny(a)redhat.com> 0.2.0-7
+- corrected the ffmpeg headers issue
+
* Wed Aug 20 2008 Karel Volny <kvolny(a)redhat.com> 0.2.0-6
- reverted previous change, the new ffmpeg is not released in this branch
16 years, 2 months
rpms/x264/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 x264-rpm.patch, 1.1, 1.2 x264.desktop, 1.1, 1.2 x264.spec, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv570
Modified Files:
.cvsignore sources x264-rpm.patch x264.desktop x264.spec
Log Message:
* Fri Sep 05 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.16.20080905
- 20080905 snapshot
- use yasm on all supported arches
- include mp4 output support via gpac by default
- drop/move obsolete fixups from %prep
- fix icon filename in desktop file
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 17:53:20 -0000 1.2
+++ .cvsignore 5 Sep 2008 10:20:21 -0000 1.3
@@ -1 +1 @@
-x264-20080613.tar.bz2
+x264-20080905.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 17:53:20 -0000 1.2
+++ sources 5 Sep 2008 10:20:21 -0000 1.3
@@ -1 +1 @@
-265f24d6f91d5ba0b448ed63c59d03fb x264-20080613.tar.bz2
+09795824d0c28bf221ba96ebeb971ed2 x264-20080905.tar.bz2
x264-rpm.patch:
Index: x264-rpm.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-rpm.patch 3 Aug 2008 17:53:20 -0000 1.1
+++ x264-rpm.patch 5 Sep 2008 10:20:21 -0000 1.2
@@ -1,60 +1,43 @@
-diff -up x264-20080420/Makefile.r x264-20080420/Makefile
---- x264-20080420/Makefile.r 2008-04-20 00:21:48.000000000 +0200
-+++ x264-20080420/Makefile 2008-05-04 21:39:38.000000000 +0200
-@@ -69,7 +69,7 @@ DEP = depend
-
- .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
-
--default: $(DEP) x264$(EXE)
-+default: $(DEP) x264$(EXE) x264_gtk_encode$(EXE)
-
- libx264.a: .depend $(OBJS) $(OBJASM)
- ar rc libx264.a $(OBJS) $(OBJASM)
-@@ -77,15 +77,16 @@ libx264.a: .depend $(OBJS) $(OBJASM)
-
- $(SONAME): .depend $(OBJS) $(OBJASM)
- $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-+ ln -s $(SONAME) libx264.so
-
--x264$(EXE): $(OBJCLI) libx264.a
-- $(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) $(SONAME)
-+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
-
--libx264gtk.a: muxers.o libx264.a
-+x264_gtk_encode$(EXE): muxers.o $(SONAME)
- $(MAKE) -C gtk
-
--checkasm: tools/checkasm.o libx264.a
-- $(CC) -o $@ $+ $(LDFLAGS)
-+checkasm: tools/checkasm.o $(SONAME)
-+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
+diff -up x264-20080905/configure.r x264-20080905/configure
+--- x264-20080905/configure.r 2008-09-05 11:30:52.000000000 +0200
++++ x264-20080905/configure 2008-09-05 11:43:27.000000000 +0200
+@@ -158,7 +158,7 @@ for opt do
+ shared="yes"
+ ;;
+ --enable-visualize)
+- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
++ LDFLAGS="$LDFLAGS -lX11"
+ CFLAGS="$CFLAGS -DVISUALIZE=1"
+ vis="yes"
+ ;;
+@@ -243,6 +243,7 @@ esac
+ case $host_cpu in
+ i*86)
+ ARCH="X86"
++ LDFLAGS="$LDFLAGS -m32"
+ AS="yasm"
+ ASFLAGS="-O2"
+ if [ "$SYS" = MACOSX ]; then
+@@ -363,7 +364,7 @@ if test "$pthread" = "yes" ; then
+ LDFLAGS="$LDFLAGS $libpthread"
+ fi
- %.o: %.asm
- $(AS) $(ASFLAGS) -o $@ $<
-@@ -152,10 +153,8 @@ install: x264$(EXE) $(SONAME)
- install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
- install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
- install -m 644 x264.h $(DESTDIR)$(includedir)
-- install -m 644 libx264.a $(DESTDIR)$(libdir)
- install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- install x264$(EXE) $(DESTDIR)$(bindir)
-- ranlib $(DESTDIR)$(libdir)/libx264.a
- ifeq ($(SYS),MINGW)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
- else
-@@ -164,7 +163,7 @@ else
- endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+-MP4_LDFLAGS="-lgpac_static"
++MP4_LDFLAGS="-lgpac"
+ if [ $SYS = MINGW ]; then
+ MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
+ fi
+@@ -478,7 +479,6 @@ if [ "$shared" = "yes" ]; then
+ fi
--install-gtk: libx264gtk.a
-+install-gtk: x264_gtk_encode$(EXE)
- $(MAKE) -C gtk install
+ if [ "$gtk" = "yes" ]; then
+- echo 'default: libx264gtk.a' >> config.mak
+ echo 'install: install-gtk' >> config.mak
+ fi
- uninstall:
-diff -up x264-20080420/gtk/Makefile.r x264-20080420/gtk/Makefile
---- x264-20080420/gtk/Makefile.r 2008-04-20 00:21:48.000000000 +0200
-+++ x264-20080420/gtk/Makefile 2008-05-04 21:34:42.000000000 +0200
+diff -up x264-20080905/gtk/Makefile.r x264-20080905/gtk/Makefile
+--- x264-20080905/gtk/Makefile.r 2008-09-05 11:30:52.000000000 +0200
++++ x264-20080905/gtk/Makefile 2008-09-05 11:41:36.000000000 +0200
@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
X264GTK_PC = x264gtk.pc
@@ -83,7 +66,7 @@
-
$(SONAMEGTK): $(OBJECTS_LIB)
@echo " L: $(@F)"
- @$(CC) -shared -o $@ $(OBJECTS_LIB) -Wl,-soname,$(SONAMEGTK) $(LDFLAGS)
+ @$(CC) -shared -o $@ $(OBJECTS_LIB) $(SOFLAGS) $(LDFLAGS)
@@ -102,7 +97,7 @@ $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TE
@$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB)
@@ -123,34 +106,60 @@
@install -d "$(DESTDIR)$(libdir)"
- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.a"
- @install -m 644 libx264gtk.a "$(DESTDIR)$(libdir)"
- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.so"
- @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.so)
+ @echo " I: $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX)"
+ @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX))
@$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
-diff -up x264-20080420/configure.r x264-20080420/configure
---- x264-20080420/configure.r 2008-04-20 00:21:48.000000000 +0200
-+++ x264-20080420/configure 2008-05-04 21:35:24.000000000 +0200
-@@ -235,6 +235,7 @@ esac
- case $host_cpu in
- i*86)
- ARCH="X86"
-+ LDFLAGS="$LDFLAGS -m32"
- AS="yasm"
- ASFLAGS="-O2"
- if [ "$SYS" = MACOSX ]; then
-@@ -372,7 +373,7 @@ if test "$pthread" = "yes" ; then
- LDFLAGS="$LDFLAGS $libpthread"
- fi
+diff -up x264-20080905/Makefile.r x264-20080905/Makefile
+--- x264-20080905/Makefile.r 2008-09-05 11:30:52.000000000 +0200
++++ x264-20080905/Makefile 2008-09-05 11:41:36.000000000 +0200
+@@ -71,7 +71,7 @@ DEP = depend
--MP4_LDFLAGS="-lgpac_static"
-+MP4_LDFLAGS="-lgpac"
- if [ $SYS = MINGW ]; then
- MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
- fi
-@@ -477,7 +478,6 @@ if [ "$shared" = "yes" ]; then
- fi
+ .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
- if [ "$gtk" = "yes" ]; then
-- echo 'default: libx264gtk.a' >> config.mak
- echo 'install: install-gtk' >> config.mak
- fi
+-default: $(DEP) x264$(EXE)
++default: $(DEP) x264$(EXE) x264_gtk_encode$(EXE)
+
+ libx264.a: .depend $(OBJS) $(OBJASM)
+ ar rc libx264.a $(OBJS) $(OBJASM)
+@@ -79,15 +79,16 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+
+ $(SONAME): .depend $(OBJS) $(OBJASM)
+ $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
++ ln -s $(SONAME) libx264.so
+-x264$(EXE): $(OBJCLI) libx264.a
+- $(CC) -o $@ $+ $(LDFLAGS)
++x264$(EXE): $(OBJCLI) $(SONAME)
++ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
+
+-libx264gtk.a: muxers.o libx264.a
++x264_gtk_encode$(EXE): muxers.o $(SONAME)
+ $(MAKE) -C gtk
+
+-checkasm: tools/checkasm.o libx264.a
+- $(CC) -o $@ $+ $(LDFLAGS)
++checkasm: tools/checkasm.o $(SONAME)
++ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
+
+ %.o: %.asm
+ $(AS) $(ASFLAGS) -o $@ $<
+@@ -154,10 +155,8 @@ install: x264$(EXE) $(SONAME)
+ install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
+ install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+ install -m 644 x264.h $(DESTDIR)$(includedir)
+- install -m 644 libx264.a $(DESTDIR)$(libdir)
+ install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+ install x264$(EXE) $(DESTDIR)$(bindir)
+- ranlib $(DESTDIR)$(libdir)/libx264.a
+ ifeq ($(SYS),MINGW)
+ $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
+ else
+@@ -166,7 +165,7 @@ else
+ endif
+ $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+
+-install-gtk: libx264gtk.a
++install-gtk: x264_gtk_encode$(EXE)
+ $(MAKE) -C gtk install
+
+ uninstall:
Index: x264.desktop
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264.desktop 3 Aug 2008 17:53:20 -0000 1.1
+++ x264.desktop 5 Sep 2008 10:20:21 -0000 1.2
@@ -4,7 +4,7 @@
Comment=Gtk+ interface to configure X264
Exec=x264_gtk_encode
Terminal=false
-Icon=x264.png
+Icon=x264
Type=Application
Encoding=UTF-8
Categories=Video;AudioVideoEditing;GTK;
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264.spec 3 Aug 2008 17:53:20 -0000 1.1
+++ x264.spec 5 Sep 2008 10:20:21 -0000 1.2
@@ -1,9 +1,9 @@
-%define snapshot 20080613
+%define snapshot 20080905
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.15.%{snapshot}%{?dist}
+Release: 0.16.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -17,14 +17,11 @@
BuildRequires: git-core
BuildRequires: gtk2-devel
BuildRequires: gettext
+BuildRequires: gpac-devel
BuildRequires: ImageMagick
-%ifarch %{ix86}
-BuildRequires: nasm
-%endif
-%ifarch x86_64
+%ifarch x86_64 %{ix86}
BuildRequires: yasm
%endif
-%{?_with_gpac:BuildRequires: gpac-devel}
%description
x264 is a free library for encoding H264/AVC video streams, written from
@@ -88,13 +85,11 @@
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
-# configure hardcodes X11 lib path
-%{__perl} -pi -e 's|/usr/X11R6/lib |%{_libdir} |g' configure
-%{__perl} -pi -e 's|^MACHINE=.*|MACHINE=%{_build}|' configure
convert gtk/x264.ico x264icon.png
%build
./configure \
+ --host=%{_target_platform} \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} \
@@ -177,6 +172,13 @@
%{_libdir}/pkgconfig/%{name}gtk.pc
%changelog
+* Fri Sep 05 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.16.20080905
+- 20080905 snapshot
+- use yasm on all supported arches
+- include mp4 output support via gpac by default
+- drop/move obsolete fixups from %%prep
+- fix icon filename in desktop file
+
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.0.0-0.15.20080613
- rebuild
16 years, 2 months
rpms/jbigkit/devel jbigkit.spec,1.3,1.4
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/jbigkit/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29800
Modified Files:
jbigkit.spec
Log Message:
oops
Index: jbigkit.spec
===================================================================
RCS file: /cvs/free/rpms/jbigkit/devel/jbigkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jbigkit.spec 3 Sep 2008 15:34:54 -0000 1.3
+++ jbigkit.spec 4 Sep 2008 23:03:09 -0000 1.4
@@ -1,6 +1,6 @@
Name: jbigkit
Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JBIG1 lossless image compression tools
Group: Applications/Multimedia
@@ -65,6 +65,7 @@
install -p -m0644 libjbig/jbig.h $RPM_BUILD_ROOT%{_includedir}
install -p -m0644 libjbig/jbig85.h $RPM_BUILD_ROOT%{_includedir}
+install -p -m0644 libjbig/jbig_ar.h $RPM_BUILD_ROOT%{_includedir}
install -p -m0755 pbmtools/???to??? $RPM_BUILD_ROOT%{_bindir}
install -p -m0755 pbmtools/???to???85 $RPM_BUILD_ROOT%{_bindir}
@@ -93,8 +94,11 @@
%{_libdir}/libjbig*.so
%{_includedir}/jbig*.h
-# Don't obfuscate email address here, please.
+# Don't obfuscate email addresses here, please.
%changelog
+* Fri Sep 05 2008 David Woodhouse <dwmw2(a)infradead.org> 2.0-2
+- Add missing jbig_ar.h
+
* Wed Sep 03 2008 David Woodhouse <dwmw2(a)infradead.org> 2.0-1
- Update to 2.0
16 years, 2 months
rpms/foo2zjs/devel foo2zjs-jbig2.patch,NONE,1.1
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/foo2zjs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29067
Added Files:
foo2zjs-jbig2.patch
Log Message:
patch for building against jbig2
foo2zjs-jbig2.patch:
--- NEW FILE foo2zjs-jbig2.patch ---
diff -ur foo2zjs.orig/hipercdecode.c foo2zjs/hipercdecode.c
--- foo2zjs.orig/hipercdecode.c 2008-05-29 10:46:26.000000000 +0100
+++ foo2zjs/hipercdecode.c 2008-09-04 18:59:49.000000000 +0100
@@ -33,6 +33,15 @@
#include "jbig.h"
/*
+ * Handle libjbig v2.0 where jbg_strerror() takes only one argument.
+ * Unfortunately the JBG_VERSION macro is a string so we can't use that.
+ * Check for the changed JBG_XXX result codes in 2.0 instead.
+ */
+#if JBG_EOK_INTR == (1<<4)
+#define jbg_strerror(x,y) jbg_strerror(x)
+#endif
+
+/*
* Global option flags
*/
int Debug = 0;
@@ -334,9 +343,9 @@
for (i = 0; i < blklen; ++i)
{
rc = jbg_dec_in(&s[pn], &blk[i], 1, &cnt);
- if (rc == JBG_OK)
+ if (rc == JBG_EOK)
break;
- if (rc != JBG_EAGAIN && rc != JBG_OK)
+ if (rc != JBG_EAGAIN && rc != JBG_EOK)
error(1, "jbg_dec_in rc=%d (%s)\n",
rc, jbg_strerror(rc, 0));
}
@@ -350,7 +359,7 @@
if (image[i])
printf("image[%d] = %x\n", i, image[i]);
}
- if (rc == JBG_OK)
+ if (rc == JBG_EOK)
{
int w, h;
16 years, 2 months
rpms/foo2zjs/devel .cvsignore, 1.2, 1.3 foo2zjs.spec, 1.2, 1.3 sources, 1.3, 1.4
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/foo2zjs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28951
Modified Files:
.cvsignore foo2zjs.spec sources
Log Message:
update
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 12:25:48 -0000 1.2
+++ .cvsignore 4 Sep 2008 22:53:06 -0000 1.3
@@ -1 +1 @@
-foo2zjs.tar.gz
+foo2zjs-20080826.tar.gz
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- foo2zjs.spec 3 Aug 2008 13:37:16 -0000 1.2
+++ foo2zjs.spec 4 Sep 2008 22:53:06 -0000 1.3
@@ -1,13 +1,17 @@
+%define foo2zjs_ver 20080826
+
Name: foo2zjs
-Version: 0.20080324
+Version: 0.%{foo2zjs_ver}
Release: 1%{?dist}
Summary: Linux printer driver for ZjStream protocol
Group: System Environment/Libraries
License: GPL
URL: http://foo2zjs.rkkda.com/
-Source0: http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+
+Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
Patch0: foo2zjs-dynamic-jbig.patch
+Patch1: foo2zjs-jbig2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
@@ -43,6 +47,11 @@
Group: System Environment/Libraries
Requires: lcms foo2zjs
+%package -n foo2oak
+Summary: Linux printer driver for OAKT protocol (HPLJ1500 etc.)
+Group: System Environment/Libraries
+Requires: lcms foo2zjs
+
%description
foo2zjs is an open source printer driver for printers that use the
Zenographics ZjStream wire protocol for their print data, such as the
@@ -151,9 +160,27 @@
Users of this package are requested to visit the author's web page at
http://foo2hiperc.rkkda.com/ and consider contributing.
+%description -n foo2oak
+foo2oak is a printer driver for printers that use the Oak Technology
+(now Zoran) OAKT protocol for their print data, such as the HP Color
+LaserJet 1500, Kyocera KM-1635 and the Kyocera KM-2035. These printers
+are often erroneously referred to as winprinters or GDI
+printers. However, Microsoft GDI only mandates the API between an
+application and the printer driver, not the protocol on the wire
+between the printer driver and the printer. In fact, OAKT printers are
+raster printers which happen to use a fairly efficient wire protocol
+which was developed by Oak Technology and licensed by some printer
+manufacturers for at least some of their product lines. OAKT is just
+one of many wire protocols that are in use today, such as Postscript,
+PCL, Epson, ZjStream, etc.
+
+Users of this package are requested to visit the author's web page at
+http://foo2oak.rkkda.com/ and consider contributing.
+
%prep
%setup -q -n foo2zjs
%patch0 -p1
+%patch1 -p1
sed -i -e s/foo2zjs-icc2ps/icc2ps/g *wrapper*
sed -i -e s/775/755/ Makefile
chmod -x COPYING
@@ -176,17 +203,6 @@
PPD=$RPM_BUILD_ROOT/usr/share/ppd \
install-extra install-crd install-man install-foo install-ppd
-
-# Remove remnants of GPL-violating foo2oak stuff.
-rm -f $RPM_BUILD_ROOT%{_bindir}/*oak*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*oak*.1
-rm -f $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/opt/foo2oak*
-rm -f $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/driver/foo2oak.xml
-rm -f $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/printer/Generic-OAKT_Printer.xml
-rm -f $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
-rm -f $RPM_BUILD_ROOT/usr/share/cups/model/Generic-OAKT_Printer.ppd.gz
-rm -f $RPM_BUILD_ROOT/usr/share/cups/model/HP-Color_LaserJet_1500.ppd.gz
-
# Remove man page for usb_printerid which we don't ship
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/usb_printerid.1
@@ -223,6 +239,8 @@
%{_datadir}/foomatic/db/source/opt/foo2hp*.xml
%{_datadir}/foomatic/db/source/printer/HP-Color_LaserJet_1600.xml
%{_datadir}/foomatic/db/source/printer/HP-Color_LaserJet_2600n.xml
+%{_datadir}/foomatic/db/source/printer/HP-Color_LaserJet_CP1215.xml
+%{_datadir}/cups/model/HP-Color_LaserJet_CP1215.ppd.gz
%{_datadir}/cups/model/HP-Color_LaserJet_1600.ppd.gz
%{_datadir}/cups/model/HP-Color_LaserJet_2600n.ppd.gz
@@ -243,12 +261,12 @@
%{_mandir}/man1/opldecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2lava.xml
%{_datadir}/foomatic/db/source/opt/foo2lava*.xml
-%{_datadir}/foomatic/db/source/printer/KonicaMinolta-magicolor_2480_MF.xml
-%{_datadir}/foomatic/db/source/printer/KonicaMinolta-magicolor_2490_MF.xml
-%{_datadir}/foomatic/db/source/printer/KonicaMinolta-magicolor_2530_DL.xml
-%{_datadir}/cups/model/KonicaMinolta-magicolor_2480_MF.ppd.gz
-%{_datadir}/cups/model/KonicaMinolta-magicolor_2490_MF.ppd.gz
-%{_datadir}/cups/model/KonicaMinolta-magicolor_2530_DL.ppd.gz
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2480_MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2490_MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2530_DL.xml
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
%files -n foo2qpdl
%{_bindir}/*qpdl*
@@ -278,6 +296,21 @@
%{_datadir}/foomatic/db/source/printer/Oki-C*.xml
%{_datadir}/cups/model/Oki-C*.ppd.gz
+%files -n foo2oak
+%{_bindir}/*oak*
+%{_mandir}/man1/*oak*.1.gz
+%{_datadir}/foomatic/db/source/opt/foo2oak*
+%{_datadir}/foomatic/db/source/driver/foo2oak.xml
+%{_datadir}/foomatic/db/source/driver/foo2oak-z1.xml
+%{_datadir}/foomatic/db/source/printer/Generic-OAKT_Printer.xml
+%{_datadir}/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
+%{_datadir}/foomatic/db/source/printer/Kyocera-KM-1635.xml
+%{_datadir}/foomatic/db/source/printer/Kyocera-KM-2035.xml
+%{_datadir}/cups/model/Generic-OAKT_Printer.ppd.gz
+%{_datadir}/cups/model/HP-Color_LaserJet_1500.ppd.gz
+%{_datadir}/cups/model/Kyocera-KM-1635.ppd.gz
+%{_datadir}/cups/model/Kyocera-KM-2035.ppd.gz
+
%doc COPYING ChangeLog INSTALL README manual.pdf
%post
@@ -295,7 +328,21 @@
%post -n foo2qpdl
/bin/rm -f /var/cache/foomatic/*
+%post -n foo2oak
+/bin/rm -f /var/cache/foomatic/*
+
+%post -n foo2slx
+/bin/rm -f /var/cache/foomatic/*
+
+%post -n foo2hiperc
+/bin/rm -f /var/cache/foomatic/*
+
%changelog
+* Thu Sep 04 2008 David Woodhouse <dwmw2(a)infradead.org> 0.20080826-1
+- Update to 20080826
+- Fixes to build with jbigkit 2.0
+- add foo2oak subpackage
+
* Wed Mar 24 2008 David Woodhouse <dwmw2(a)infradead.org> 0.20080324-1
- Update to 20080324
- add foo2slx and foo2hiperc subpackage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Aug 2008 13:37:16 -0000 1.3
+++ sources 4 Sep 2008 22:53:06 -0000 1.4
@@ -1 +1 @@
-85351317f8aa7028f5bbea638a2f7846 foo2zjs.tar.gz
+d714e40746cf1a13e6945f13d211ff6a foo2zjs-20080826.tar.gz
16 years, 2 months
rpms/libcapsimage/F-9 libcapsimage.spec,1.1,1.2
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/libcapsimage/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25962/F-9
Modified Files:
libcapsimage.spec
Log Message:
rebuild for rpmfusion inclusion
Index: libcapsimage.spec
===================================================================
RCS file: /cvs/nonfree/rpms/libcapsimage/F-9/libcapsimage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcapsimage.spec 4 Sep 2008 11:25:21 -0000 1.1
+++ libcapsimage.spec 4 Sep 2008 21:55:48 -0000 1.2
@@ -3,7 +3,7 @@
Name: libcapsimage
Version: 2.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Provides IPF support, primarily for UAE/E-UAE
Group: System Environment/Libraries
License: SPSFLA
@@ -142,6 +142,9 @@
%changelog
+* Thu Sep 04 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.0.0-7
+- Rebuild for rpmfusion inclusion.
+
* Thu Mar 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 2.0.0-6
- Compile ipfinfo, don't use precompiled version (its broken)
@@ -165,4 +168,4 @@
- Now includes ipfinfo in RPM and installs to bindir
* Wed Dec 01 2004 Ian Chapman <packages[AT]amiga-hardware.com> 2.0.0-1.iss
-- Initial Release
\ No newline at end of file
+- Initial Release
16 years, 2 months
