remove conflicting file %{_infodir}/dir; dropped jpeg-mmx for ix86 [release 2.1.0-3mamba;Mon Dec 14 2020]

This commit is contained in:
Silvan Calarco 2024-01-06 07:10:59 +01:00
parent 32c1795ef7
commit e49cd812cf
2 changed files with 103 additions and 36 deletions

View File

@ -0,0 +1,50 @@
diff -ru mjpegtools-2.1.0/y4mdenoise/Makefile.am new/y4mdenoise/Makefile.am
--- mjpegtools-2.1.0/y4mdenoise/Makefile.am 2012-04-01 10:43:55.000000000 +0200
+++ new/y4mdenoise/Makefile.am 2018-09-04 02:00:06.296975920 +0200
@@ -4,8 +4,8 @@
EXTRA_DIST = implementation.html
-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+AM_CFLAGS = -DNDEBUG -finline-functions
+AM_CXXFLAGS = -DNDEBUG -finline-functions
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
diff -ru mjpegtools-2.1.0/y4munsharp/Makefile.am new/y4munsharp/Makefile.am
--- mjpegtools-2.1.0/y4munsharp/Makefile.am 2005-06-16 19:09:38.000000000 +0200
+++ new/y4munsharp/Makefile.am 2018-09-04 01:59:37.330309169 +0200
@@ -4,7 +4,7 @@
INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
-y4munharp_CFLAGS=@PROGRAM_NOPIC@
+y4munharp_CFLAGS=
bin_PROGRAMS = y4munsharp
diff -ru mjpegtools-2.1.0/y4mutils/Makefile.am new/y4mutils/Makefile.am
--- mjpegtools-2.1.0/y4mutils/Makefile.am 2012-04-01 10:43:35.000000000 +0200
+++ new/y4mutils/Makefile.am 2018-09-04 01:58:58.273642386 +0200
@@ -1,8 +1,7 @@
# Makefile for y4mutils
MAINTAINERCLEANFILES = Makefile.in
-
-AM_CFLAGS = @PROGRAM_NOPIC@
+AM_CFLAGS=
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
diff -ru mjpegtools-2.1.0/yuvscaler/Makefile.am new/yuvscaler/Makefile.am
--- mjpegtools-2.1.0/yuvscaler/Makefile.am 2012-04-01 10:44:27.000000000 +0200
+++ new/yuvscaler/Makefile.am 2018-09-04 02:00:06.296975920 +0200
@@ -18,6 +18,6 @@
EXTRA_DIST = yuvscaler_implementation.txt
-yuvscaler_CFLAGS=@PROGRAM_NOPIC@
+yuvscaler_CFLAGS=
yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)

View File

@ -2,7 +2,7 @@
Name: mjpegtools Name: mjpegtools
Version: 2.1.0 Version: 2.1.0
Release: 1mamba Release: 3mamba
Summary: Tools for recording, editing, playing and encoding mpeg video Summary: Tools for recording, editing, playing and encoding mpeg video
Group: Applications/Multimedia Group: Applications/Multimedia
Vendor: openmamba Vendor: openmamba
@ -14,42 +14,42 @@ Source1: http://downloads.sourceforge.net/sourceforge/mjpeg/jpeg-mmx-%{jpe
Patch: %{name}-1.8.0-libquicktime.patch Patch: %{name}-1.8.0-libquicktime.patch
Patch1: %{name}-1.8.0-gcc42.patch Patch1: %{name}-1.8.0-gcc42.patch
Patch2: %{name}-1.9.0-kernel-2.6.38.patch Patch2: %{name}-1.9.0-kernel-2.6.38.patch
Patch3: mjpegtools-2.1.0-avoid-fno-pic.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: ldconfig
%ifnarch aarch64
BuildRequires: libSDL-devel
BuildRequires: libSDL_gfx-devel
%endif
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXdmcp-devel
BuildRequires: libatk-devel BuildRequires: libatk-devel
BuildRequires: libbrotli-devel
BuildRequires: libbsd-devel
BuildRequires: libbzip2-devel BuildRequires: libbzip2-devel
BuildRequires: libcairo-devel BuildRequires: libcairo-devel
BuildRequires: libdirectfb-devel
BuildRequires: libdv-devel BuildRequires: libdv-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libffi-devel BuildRequires: libfaad2-devel
BuildRequires: libfontconfig-devel BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel BuildRequires: libgdk-pixbuf-devel
BuildRequires: libGL-devel
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libgraphite2-devel
BuildRequires: libgtk2-devel BuildRequires: libgtk2-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpango-devel BuildRequires: libpango-devel
BuildRequires: libpixman-devel BuildRequires: libpcre-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libpthread-stubs-devel
BuildRequires: libquicktime-devel BuildRequires: libquicktime-devel
BuildRequires: libSDL-devel
BuildRequires: libSDL_gfx-devel
BuildRequires: libselinux-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libts-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXrender-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: pkg-config
BuildRequires: udev-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: nasm BuildRequires: nasm
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -79,34 +79,40 @@ Obsoletes: mjpegtools-devel
%description -n libmjpegtools-devel %description -n libmjpegtools-devel
This package contains static libraries and C system header files needed to compile applications that use part of the libraries of the m jpegtools package. This package contains static libraries and C system header files needed to compile applications that use part of the libraries of the m jpegtools package.
%debug_package
%prep %prep
%setup -q %setup -q
%ifarch %{ix86} #%ifarch %{ix86}
%setup -q -a1 #% setup -q -a1
%patch1 -p1 #% patch1 -p1
%endif #%endif
#%patch2 -p1 #%patch2 -p1
%patch3 -p1
autoreconf -f -i
%build %build
%ifarch %{ix86} #%ifarch %{ix86}
pushd jpeg-mmx #pushd jpeg-mmx
%configure #% configure
%make -j1 #% make -j1
popd #popd
%endif #%endif
%configure \ %configure \
--with-quicktime \ --with-quicktime \
--with-dv=%{_prefix} \ --with-dv=%{_prefix} \
--with-dv-yv12 \ --with-dv-yv12 \
%ifarch %{ix86}
--with-jpeg-mmx="`pwd`/jpeg-mmx-%{jpegmmx_version}" \
%endif
--enable-shared \ --enable-shared \
--enable-large-file \ --enable-large-file \
--enable-cmov-extension \ --enable-cmov-extension \
--enable-xfree-ext \ --enable-xfree-ext \
--enable-simd-accel --enable-simd-accel
#%ifarch %{ix86}
# --with-jpeg-mmx="`pwd`/jpeg-mmx-%{jpegmmx_version}" \
#%endif
# --enable-zalpha # --enable-zalpha
%ifarch %{ix86} %ifarch %{ix86}
@ -115,23 +121,27 @@ find ./ -name Makefile \
-exec sed -i "s/\(.*-march=\)[^ ]*\(.*\)/\1%{_target_cpu}\2/g" {} \; -exec sed -i "s/\(.*-march=\)[^ ]*\(.*\)/\1%{_target_cpu}\2/g" {} \;
%endif %endif
%make -j1 CPPFLAGS="-fpermissive" %make
#-j1 CPPFLAGS="-fpermissive"
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall %makeinstall
rm -f %{buildroot}%{_infodir}/dir
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post %post
/sbin/ldconfig /sbin/ldconfig
%install_info mjpeg-howto.info %install_info mjpeg-howto.info
:
%preun %preun
/sbin/ldconfig /sbin/ldconfig
%uninstall_info mjpeg-howto.info %uninstall_info mjpeg-howto.info
exit 0 :
%files %files
%defattr(-, root, root) %defattr(-, root, root)
@ -141,20 +151,27 @@ exit 0
%files -n libmjpegtools %files -n libmjpegtools
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/*.so.* %{_libdir}/lib*.so.*
%doc AUTHORS ChangeLog %doc AUTHORS
%files -n libmjpegtools-devel %files -n libmjpegtools-devel
%defattr(-, root, root) %defattr(-, root, root)
%dir %{_includedir}/mjpegtools/ %dir %{_includedir}/mjpegtools/
%{_includedir}/mjpegtools/* %{_includedir}/mjpegtools/*
%{_libdir}/*.a %{_libdir}/lib*.a
%{_libdir}/*.la %{_libdir}/lib*.la
%{_libdir}/*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%doc ChangeLog
%doc BUGS CHANGES COPYING HINTS PLANS README* TODO %doc BUGS CHANGES COPYING HINTS PLANS README* TODO
%changelog %changelog
* Mon Dec 14 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-3mamba
- remove conflicting file %{_infodir}/dir; dropped jpeg-mmx for ix86
* Sat Dec 12 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-2mamba
- rebuilt with debug package and without libSDL
* Sun Mar 09 2014 Automatic Build System <autodist@mambasoft.it> 2.1.0-1mamba * Sun Mar 09 2014 Automatic Build System <autodist@mambasoft.it> 2.1.0-1mamba
- automatic version update by autodist - automatic version update by autodist