- libmp1e_common was a broken idea (code not prepared to be used as a library); rever...

diff --git a/mp1e-common.patch b/mp1e-common.patch
deleted file mode 100644 (file)
index 63f7553..0000000
--- a/mp1e-common.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Nur mp1e-1.9.3.orig/configure.in mp1e-1.9.3/configure.in
---- mp1e-1.9.3.orig/configure.in       2003-01-03 06:33:27.000000000 +0100
-+++ mp1e-1.9.3/configure.in    2003-11-10 23:18:06.247765000 +0100
-@@ -136,10 +136,12 @@
- dnl ALSA support (libasound)
- dnl
- have_libasound=no
-+save_LIBS="$LIBS"
- AM_PATH_ALSA([0.9.0], [have_libasound=yes], [true])
- if test "x$have_libasound" = "xyes"; then
-   AC_DEFINE(HAVE_ALSA, 1, [Define if you have ALSA 0.9.x.])
- fi
-+LIBS="$save_LIBS"
- 
- dnl
- dnl EsounD support
-@@ -164,9 +166,10 @@
- dnl for audio compression from WAV etc
- dnl
- have_audiofile=yes
-+AUDIOFILE_LIB=
- AC_CHECK_HEADER(audiofile.h,
--  AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat,,
--    have_audiofile=no), have_audiofile=no)
-+  [AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat,[AUDIOFILE_LIB="-laudiofile"],
-+    have_audiofile=no)], have_audiofile=no)
- 
- dnl
- dnl V4l/2 always compiled in
---- mp1e-1.9.4.orig/Makefile.am        2002-12-14 01:43:43.000000000 +0100
-+++ mp1e-1.9.4/Makefile.am     2003-11-10 23:16:18.116203496 +0100
-@@ -31,14 +31,22 @@ dist-hook:
-               rm -rf $(distdir)/$$file; done
- 
- bin_PROGRAMS = mp1e
-+lib_LTLIBRARIES = libmp1e_common.la
- 
--mp1e_SOURCES = main.c options.c global_data.c options.h
-+libmp1e_common_la_SOURCES =
-+libmp1e_common_la_LIBADD = \
-+      systems/libsystems.la \
-+      audio/libaudio.la \
-+      video/libvideo.la \
-+      common/libcommon.la -lm
-+
-+mp1e_SOURCES = main.c options.c global_data.c options.h video/filter.c
- 
- mp1e_LDADD = \
--      systems/libsystems.la \
--      audio/libaudio.la vbi/libvbi.la \
--      devices/libdevices.la video/libvideo.la common/libcommon.la \
--      test/libtest.la $(X_LIBS) -lm $(PTHREAD_LIB) $(ESD_LIBS)
-+      libmp1e_common.la \
-+      vbi/libvbi.la \
-+      devices/libdevices.la \
-+      test/libtest.la $(X_LIBS) -lm $(PTHREAD_LIB) $(ESD_LIBS) $(ALSA_LIBS)
- 
- man_MANS = mp1e.1
- 
-diff -Nur mp1e-1.9.3.orig/video/Makefile.am mp1e-1.9.3/video/Makefile.am
---- mp1e-1.9.3.orig/video/Makefile.am  2002-10-03 00:10:18.000000000 +0200
-+++ mp1e-1.9.3/video/Makefile.am       2003-11-10 23:13:02.947873592 +0100
-@@ -18,7 +18,7 @@
- 
- libvideo_la_SOURCES = \
-       dct.c dct_mmx.s dct.h dct_ieee.h dct_ref.c \
--      filter.c filter_mmx.s \
-+      filter_mmx.s \
-       mblock.c mblock.h ratectl.h \
-       mpeg1.c mpeg2.c mpeg.h video.h libvideo.h \
-       tables.c vlc.c vlc_mmx.s vlc.h vlc_tables.h \

diff --git a/mp1e.spec b/mp1e.spec
index b81b97e2b9e4162795fb7bc9a9aa338df0caf91c..1e63c4967a6415450d2c895f27f8ba0ea82e4164 100644 (file)
--- a/mp1e.spec
+++ b/mp1e.spec
@@ -1,20 +1,18 @@
 #
 # Conditional build:
 %bcond_without alsa            # ALSA support
-%bcond_without static_libs     # static library
 #
 Summary:       MP1E - Real Time Software MPEG-1 Encoder
 Summary(pl.UTF-8):     MP1E - koder MPEG-1 Real Time Software
 Name:          mp1e
 Version:       1.9.4
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         X11/Applications/Multimedia
 #Source0Download: https://sourceforge.net/projects/zapping/files/OldFiles/
 Source0:       https://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 # Source0-md5: 4dad97af4db5d4ba61c3a2aec5ebd932
-Patch0:                %{name}-common.patch
-Patch1:                %{name}-gcc.patch
+Patch0:                %{name}-gcc.patch
 URL:           https://zapping.sourceforge.net/Zapping/index.html
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 BuildRequires: audiofile-devel
@@ -23,6 +21,9 @@ BuildRequires:        automake
 BuildRequires: esound-devel
 BuildRequires: libtool
 Requires:      %{name}-libs = %{version}-%{release}
+Obsoletes:     mp1e-libs < 1.9.4-2
+Obsoletes:     mp1e-devel < 1.9.4-2
+Obsoletes:     mp1e-static < 1.9.4-2
 # x86 or only i586/i686/athlon?
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,47 +38,9 @@ Program MP1E zapisuje jako strumień MPEG-1 obraz i dźwięk z urządzenia
 przechwytywania obrazu zgodnego z v4l lub v4l2 oraz urządzenia dźwięku
 OSS lub ALSA. Obsługiwane są tylko procesory x86 z rozszerzeniem MMX.
 
-%package libs
-Summary:       MP1E - Real Time Software MPEG-1 Encoder library
-Summary(pl.UTF-8):     Biblioteka MP1E - kodera MPEG-1 Real Time Software
-Group:         Libraries
-
-%description libs
-MP1E - Real Time Software MPEG-1 Encoder library, used by mp1e program
-and mp1e backend in rte.
-
-%description libs -l pl.UTF-8
-Biblioteka MP1E - kodera MPEG-1 Real Time Software, używana przez
-program mp1e oraz backend mp1e w rte.
-
-%package devel
-Summary:       Development files for MP1E library
-Summary(pl.UTF-8):     Pliki programistyczne biblioteki MP1E
-Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
-
-%description devel
-Development files for MP1E library.
-
-%description devel -l pl.UTF-8
-Pliki programistyczne biblioteki MP1E.
-
-%package static
-Summary:       Static MP1E library
-Summary(pl.UTF-8):     Statyczna biblioteka MP1E
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static MP1E library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka MP1E.
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %{__rm} macros/{alsa,as}.m4
 %if %{without alsa}
@@ -90,9 +53,8 @@ echo 'AC_DEFUN([AM_PATH_ALSA], [$3])' > macros/alsa.m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-       --enable-shared \
-       %{!?with_static_libs:--disable-static}
+%configure
+
 %{__make}
 
 %install
@@ -104,27 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS BUGS ChangeLog README
 %attr(755,root,root) %{_bindir}/mp1e
 %{_mandir}/man1/mp1e.1*
-
-%files libs
-%defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog README
-%attr(755,root,root) %{_libdir}/libmp1e_common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmp1e_common.so.0
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmp1e_common.so
-%{_libdir}/libmp1e_common.la
-
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libmp1e_common.a
-%endif