From a01dcc327941d66cdd3129d1b3f8ce02ad474257 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 18 May 2014 10:40:01 +0200 Subject: [PATCH] - updated to 0.4.5 - removed obsolete gcc,am18,gcc4,gnu-stack,fPIC patches --- smpeg-am18.patch | 11 -- smpeg-fPIC.patch | 308 ------------------------------------------ smpeg-gcc.patch | 26 ---- smpeg-gcc4.patch | 41 ------ smpeg-gnu-stack.patch | 32 ----- smpeg.spec | 105 +++++++------- 6 files changed, 53 insertions(+), 470 deletions(-) delete mode 100644 smpeg-am18.patch delete mode 100644 smpeg-fPIC.patch delete mode 100644 smpeg-gcc.patch delete mode 100644 smpeg-gcc4.patch delete mode 100644 smpeg-gnu-stack.patch diff --git a/smpeg-am18.patch b/smpeg-am18.patch deleted file mode 100644 index 13c821a..0000000 --- a/smpeg-am18.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- smpeg-0.4.4/smpeg.m4.orig Mon Dec 22 14:03:10 2003 -+++ smpeg-0.4.4/smpeg.m4 Mon Dec 22 14:03:34 2003 -@@ -10,7 +10,7 @@ - ACTION-IF-NOT-FOUND]]]) - dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS - dnl --AC_DEFUN(AM_PATH_SMPEG, -+AC_DEFUN([AM_PATH_SMPEG], - [dnl - dnl Get the cflags and libraries from the smpeg-config script - dnl diff --git a/smpeg-fPIC.patch b/smpeg-fPIC.patch deleted file mode 100644 index 8866301..0000000 --- a/smpeg-fPIC.patch +++ /dev/null @@ -1,308 +0,0 @@ -Fix PIC issues in mmx routines - ---- video/mmxflags_asm.S -+++ video/mmxflags_asm.S -@@ -1,11 +1,6 @@ - - #if defined(i386) && defined(USE_MMX) - --.data -- .align 16 -- .type flags,@object --flags: .long 0 -- - .text - .align 4 - .globl cpu_flags -@@ -40,16 +35,13 @@ cpu_flags: - xorl %ecx,%eax - je cpu_flags.L1 - -- pusha -+ pushl %ebx - - movl $1,%eax - cpuid -+ movl %edx,%eax - -- movl %edx,flags -- -- popa -- -- movl flags,%eax -+ popl %ebx - - cpu_flags.L1: - ret ---- video/mmxidct_asm.S -+++ video/mmxidct_asm.S -@@ -31,11 +31,6 @@ preSC: .short 16384,22725,21407,19266, - x0005000200010001: - .long 0x00010001,0x00050002 - .align 8 -- .type x0040000000000000,@object -- .size x0040000000000000,8 --x0040000000000000: -- .long 0, 0x00400000 -- .align 8 - .type x5a825a825a825a82,@object - .size x5a825a825a825a82,8 - x5a825a825a825a82: -@@ -80,8 +75,21 @@ scratch7: - x0: - .long 0,0 - .align 8 -+ - .text - .align 4 -+ -+#ifdef __PIC__ -+# undef __i686 /* gcc define gets in our way */ -+# define MUNG(sym) sym ## @GOTOFF(%ebx) -+# define INIT_PIC() \ -+ call __i686.get_pc_thunk.bx ; \ -+ addl $_GLOBAL_OFFSET_TABLE_, %ebx -+#else -+# define MUNG(sym) sym -+# define INIT_PIC() -+#endif -+ - .globl IDCT_mmx - .type IDCT_mmx,@function - IDCT_mmx: -@@ -92,8 +100,9 @@ IDCT_mmx: - pushl %edx - pushl %esi - pushl %edi -+ INIT_PIC() - movl 8(%ebp),%esi /* source matrix */ -- leal preSC, %ecx -+ leal MUNG(preSC), %ecx - /* column 0: even part - * use V4, V12, V0, V8 to produce V22..V25 - */ -@@ -109,7 +118,7 @@ IDCT_mmx: - movq %mm1, %mm2 /* added 11/1/96 */ - pmulhw 8*8(%esi),%mm5 /* V8 */ - psubsw %mm0, %mm1 /* V16 */ -- pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V18 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V18 */ - paddsw %mm0, %mm2 /* V17 */ - movq %mm2, %mm0 /* duplicate V17 */ - psraw $1, %mm2 /* t75=t82 */ -@@ -150,7 +159,7 @@ IDCT_mmx: - paddsw %mm0, %mm3 /* V29 ; free mm0 */ - movq %mm7, %mm1 /* duplicate V26 */ - psraw $1, %mm3 /* t91=t94 */ -- pmulhw x539f539f539f539f,%mm7 /* V33 */ -+ pmulhw MUNG(x539f539f539f539f),%mm7 /* V33 */ - psraw $1, %mm1 /* t96 */ - movq %mm5, %mm0 /* duplicate V2 */ - psraw $2, %mm4 /* t85=t87 */ -@@ -158,15 +167,15 @@ IDCT_mmx: - psubsw %mm4, %mm0 /* V28 ; free mm4 */ - movq %mm0, %mm2 /* duplicate V28 */ - psraw $1, %mm5 /* t90=t93 */ -- pmulhw x4546454645464546,%mm0 /* V35 */ -+ pmulhw MUNG(x4546454645464546),%mm0 /* V35 */ - psraw $1, %mm2 /* t97 */ - movq %mm5, %mm4 /* duplicate t90=t93 */ - psubsw %mm2, %mm1 /* V32 ; free mm2 */ -- pmulhw x61f861f861f861f8,%mm1 /* V36 */ -+ pmulhw MUNG(x61f861f861f861f8),%mm1 /* V36 */ - psllw $1, %mm7 /* t107 */ - paddsw %mm3, %mm5 /* V31 */ - psubsw %mm3, %mm4 /* V30 ; free mm3 */ -- pmulhw x5a825a825a825a82,%mm4 /* V34 */ -+ pmulhw MUNG(x5a825a825a825a82),%mm4 /* V34 */ - nop - psubsw %mm1, %mm0 /* V38 */ - psubsw %mm7, %mm1 /* V37 ; free mm7 */ -@@ -233,7 +242,7 @@ IDCT_mmx: - psubsw %mm7, %mm1 /* V50 */ - pmulhw 8*9(%esi), %mm5 /* V9 */ - paddsw %mm7, %mm2 /* V51 */ -- pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V52 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V52 */ - movq %mm2, %mm6 /* duplicate V51 */ - psraw $1, %mm2 /* t138=t144 */ - movq %mm3, %mm4 /* duplicate V1 */ -@@ -274,11 +283,11 @@ IDCT_mmx: - * even more by doing the correction step in a later stage when the number - * is actually multiplied by 16 - */ -- paddw x0005000200010001, %mm4 -+ paddw MUNG(x0005000200010001), %mm4 - psubsw %mm6, %mm3 /* V60 ; free mm6 */ - psraw $1, %mm0 /* t154=t156 */ - movq %mm3, %mm1 /* duplicate V60 */ -- pmulhw x539f539f539f539f, %mm1 /* V67 */ -+ pmulhw MUNG(x539f539f539f539f), %mm1 /* V67 */ - movq %mm5, %mm6 /* duplicate V3 */ - psraw $2, %mm4 /* t148=t150 */ - paddsw %mm4, %mm5 /* V61 */ -@@ -287,13 +296,13 @@ IDCT_mmx: - psllw $1, %mm1 /* t169 */ - paddsw %mm0, %mm5 /* V65 -> result */ - psubsw %mm0, %mm4 /* V64 ; free mm0 */ -- pmulhw x5a825a825a825a82, %mm4 /* V68 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm4 /* V68 */ - psraw $1, %mm3 /* t158 */ - psubsw %mm6, %mm3 /* V66 */ - movq %mm5, %mm2 /* duplicate V65 */ -- pmulhw x61f861f861f861f8, %mm3 /* V70 */ -+ pmulhw MUNG(x61f861f861f861f8), %mm3 /* V70 */ - psllw $1, %mm6 /* t165 */ -- pmulhw x4546454645464546, %mm6 /* V69 */ -+ pmulhw MUNG(x4546454645464546), %mm6 /* V69 */ - psraw $1, %mm2 /* t172 */ - /* moved from next block */ - movq 8*5(%esi), %mm0 /* V56 */ -@@ -418,7 +427,7 @@ IDCT_mmx: - * movq 8*13(%esi), %mm4 tmt13 - */ - psubsw %mm4, %mm3 /* V134 */ -- pmulhw x5a825a825a825a82, %mm3 /* 23170 ->V136 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm3 /* 23170 ->V136 */ - movq 8*9(%esi), %mm6 /* tmt9 */ - paddsw %mm4, %mm5 /* V135 ; mm4 free */ - movq %mm0, %mm4 /* duplicate tmt1 */ -@@ -447,17 +456,17 @@ IDCT_mmx: - psubsw %mm7, %mm0 /* V144 */ - movq %mm0, %mm3 /* duplicate V144 */ - paddsw %mm7, %mm2 /* V147 ; free mm7 */ -- pmulhw x539f539f539f539f, %mm0 /* 21407-> V151 */ -+ pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V151 */ - movq %mm1, %mm7 /* duplicate tmt3 */ - paddsw %mm5, %mm7 /* V145 */ - psubsw %mm5, %mm1 /* V146 ; free mm5 */ - psubsw %mm1, %mm3 /* V150 */ - movq %mm7, %mm5 /* duplicate V145 */ -- pmulhw x4546454645464546, %mm1 /* 17734-> V153 */ -+ pmulhw MUNG(x4546454645464546), %mm1 /* 17734-> V153 */ - psubsw %mm2, %mm5 /* V148 */ -- pmulhw x61f861f861f861f8, %mm3 /* 25080-> V154 */ -+ pmulhw MUNG(x61f861f861f861f8), %mm3 /* 25080-> V154 */ - psllw $2, %mm0 /* t311 */ -- pmulhw x5a825a825a825a82, %mm5 /* 23170-> V152 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm5 /* 23170-> V152 */ - paddsw %mm2, %mm7 /* V149 ; free mm2 */ - psllw $1, %mm1 /* t313 */ - nop /* without the nop - freeze here for one clock */ -@@ -483,7 +492,7 @@ IDCT_mmx: - paddsw %mm3, %mm6 /* V164 ; free mm3 */ - movq %mm4, %mm3 /* duplicate V142 */ - psubsw %mm5, %mm4 /* V165 ; free mm5 */ -- movq %mm2, scratch7 /* out7 */ -+ movq %mm2, MUNG(scratch7) /* out7 */ - psraw $4, %mm6 - psraw $4, %mm4 - paddsw %mm5, %mm3 /* V162 */ -@@ -494,11 +503,11 @@ IDCT_mmx: - */ - movq %mm6, 8*9(%esi) /* out9 */ - paddsw %mm1, %mm0 /* V161 */ -- movq %mm3, scratch5 /* out5 */ -+ movq %mm3, MUNG(scratch5) /* out5 */ - psubsw %mm1, %mm5 /* V166 ; free mm1 */ - movq %mm4, 8*11(%esi) /* out11 */ - psraw $4, %mm5 -- movq %mm0, scratch3 /* out3 */ -+ movq %mm0, MUNG(scratch3) /* out3 */ - movq %mm2, %mm4 /* duplicate V140 */ - movq %mm5, 8*13(%esi) /* out13 */ - paddsw %mm7, %mm2 /* V160 */ -@@ -508,7 +517,7 @@ IDCT_mmx: - /* moved from the next block */ - movq 8*3(%esi), %mm7 - psraw $4, %mm4 -- movq %mm2, scratch1 /* out1 */ -+ movq %mm2, MUNG(scratch1) /* out1 */ - /* moved from the next block */ - movq %mm0, %mm1 - movq %mm4, 8*15(%esi) /* out15 */ -@@ -565,15 +574,15 @@ IDCT_mmx: - paddsw %mm4, %mm3 /* V113 ; free mm4 */ - movq %mm0, %mm4 /* duplicate V110 */ - paddsw %mm1, %mm2 /* V111 */ -- pmulhw x539f539f539f539f, %mm0 /* 21407-> V117 */ -+ pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V117 */ - psubsw %mm1, %mm5 /* V112 ; free mm1 */ - psubsw %mm5, %mm4 /* V116 */ - movq %mm2, %mm1 /* duplicate V111 */ -- pmulhw x4546454645464546, %mm5 /* 17734-> V119 */ -+ pmulhw MUNG(x4546454645464546), %mm5 /* 17734-> V119 */ - psubsw %mm3, %mm2 /* V114 */ -- pmulhw x61f861f861f861f8, %mm4 /* 25080-> V120 */ -+ pmulhw MUNG(x61f861f861f861f8), %mm4 /* 25080-> V120 */ - paddsw %mm3, %mm1 /* V115 ; free mm3 */ -- pmulhw x5a825a825a825a82, %mm2 /* 23170-> V118 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm2 /* 23170-> V118 */ - psllw $2, %mm0 /* t266 */ - movq %mm1, (%esi) /* save V115 */ - psllw $1, %mm5 /* t268 */ -@@ -591,7 +600,7 @@ IDCT_mmx: - movq %mm6, %mm3 /* duplicate tmt4 */ - psubsw %mm0, %mm6 /* V100 */ - paddsw %mm0, %mm3 /* V101 ; free mm0 */ -- pmulhw x5a825a825a825a82, %mm6 /* 23170 ->V102 */ -+ pmulhw MUNG(x5a825a825a825a82), %mm6 /* 23170 ->V102 */ - movq %mm7, %mm5 /* duplicate tmt0 */ - movq 8*8(%esi), %mm1 /* tmt8 */ - paddsw %mm1, %mm7 /* V103 */ -@@ -625,10 +634,10 @@ IDCT_mmx: - movq 8*2(%esi), %mm3 /* V123 */ - paddsw %mm4, %mm7 /* out0 */ - /* moved up from next block */ -- movq scratch3, %mm0 -+ movq MUNG(scratch3), %mm0 - psraw $4, %mm7 - /* moved up from next block */ -- movq scratch5, %mm6 -+ movq MUNG(scratch5), %mm6 - psubsw %mm4, %mm1 /* out14 ; free mm4 */ - paddsw %mm3, %mm5 /* out2 */ - psraw $4, %mm1 -@@ -639,7 +648,7 @@ IDCT_mmx: - movq %mm5, 8*2(%esi) /* out2 ; free mm5 */ - psraw $4, %mm2 - /* moved up to the prev block */ -- movq scratch7, %mm4 -+ movq MUNG(scratch7), %mm4 - /* moved up to the prev block */ - psraw $4, %mm0 - movq %mm2, 8*12(%esi) /* out12 ; free mm2 */ -@@ -647,13 +656,13 @@ IDCT_mmx: - psraw $4, %mm6 - /* move back the data to its correct place - * moved up to the prev block -- * movq scratch3, %mm0 -- * movq scratch5, %mm6 -- * movq scratch7, %mm4 -+ * movq MUNG(scratch3), %mm0 -+ * movq MUNG(scratch5), %mm6 -+ * movq MUNG(scratch7), %mm4 - * psraw $4, %mm0 - * psraw $4, %mm6 - */ -- movq scratch1, %mm1 -+ movq MUNG(scratch1), %mm1 - psraw $4, %mm4 - movq %mm0, 8*3(%esi) /* out3 */ - psraw $4, %mm1 -@@ -671,6 +680,15 @@ IDCT_mmx: - .Lfe1: - .size IDCT_mmx,.Lfe1-IDCT_mmx - -+#ifdef __PIC__ -+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits -+.globl __i686.get_pc_thunk.bx -+ .hidden __i686.get_pc_thunk.bx -+ .type __i686.get_pc_thunk.bx,@function -+ __i686.get_pc_thunk.bx: -+ movl (%esp), %ebx -+ ret -+#endif - - #endif /* i386 && USE_MMX */ - diff --git a/smpeg-gcc.patch b/smpeg-gcc.patch deleted file mode 100644 index 0c8febc..0000000 --- a/smpeg-gcc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur smpeg-0.4.4.orig/smpeg.m4 smpeg-0.4.4.chng/smpeg.m4 ---- smpeg-0.4.4.orig/smpeg.m4 Wed Apr 4 22:28:14 2001 -+++ smpeg-0.4.4.chng/smpeg.m4 Thu Jul 24 14:10:50 2003 -@@ -111,16 +111,13 @@ - } - else - { -- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the --minimum version\n", $smpeg_major_version, $smpeg_minor_version, --$smpeg_micro_version); -- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is --correct, then it is\n", major, minor, micro); -+ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", -+$smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version); -+ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", -+major, minor, micro); - printf("*** best to upgrade to the required version.\n"); -- printf("*** If smpeg-config was wrong, set the environment variable --SMPEG_CONFIG\n"); -- printf("*** to point to the correct copy of smpeg-config, and remove --the file\n"); -+ printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n"); -+ printf("*** to point to the correct copy of smpeg-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } diff --git a/smpeg-gcc4.patch b/smpeg-gcc4.patch deleted file mode 100644 index 4a0eeb4..0000000 --- a/smpeg-gcc4.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: MPEGaudio.h -=================================================================== -RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v -retrieving revision 1.23 -diff -u -p -r1.23 MPEGaudio.h ---- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 -+++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 -@@ -151,12 +151,6 @@ private: - /* The actual MPEG audio class */ - class MPEGaudio : public MPEGerror, public MPEGaudioaction { - -- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -- friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); --#ifdef THREADED_AUDIO -- friend int Decode_MPEGaudio(void *udata); --#endif -- - public: - MPEGaudio(MPEGstream *stream, bool initSDL = true); - virtual ~MPEGaudio(); -@@ -367,6 +361,20 @@ public: - #define N_TIMESTAMPS 5 - - double timestamp[N_TIMESTAMPS]; -+ -+ /* Functions which access MPEGaudio internals */ -+ friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+ friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+ friend int Decode_MPEGaudio(void *udata); -+#endif - }; - -+/* Need to duplicate the prototypes, this is not a typo :) */ -+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+int Decode_MPEGaudio(void *udata); -+#endif -+ - #endif /* _MPEGAUDIO_H_ */ diff --git a/smpeg-gnu-stack.patch b/smpeg-gnu-stack.patch deleted file mode 100644 index 1b8de6d..0000000 --- a/smpeg-gnu-stack.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make sure that the asm files don't incorrectly trigger an executable -stack marking in the final shared library. That's bad, mmmkay. - -before: -$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK - GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 - 0x0000000000000000 0x0000000000000000 RWE 8 -after: -$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK - GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 - 0x0000000000000000 0x0000000000000000 RW 8 - ---- smpeg-0.4.4/video/mmxflags_asm.S -+++ smpeg-0.4.4/video/mmxflags_asm.S -@@ -57,3 +57,7 @@ - .size cpu_flags,.Lfe1-cpu_flags - - #endif /* i386 && USE_MMX */ -+ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",@progbits -+#endif ---- smpeg-0.4.4/video/mmxidct_asm.S -+++ smpeg-0.4.4/video/mmxidct_asm.S -@@ -673,3 +673,7 @@ - - - #endif /* i386 && USE_MMX */ -+ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",@progbits -+#endif diff --git a/smpeg.spec b/smpeg.spec index 799a315..6c7922f 100644 --- a/smpeg.spec +++ b/smpeg.spec @@ -4,30 +4,26 @@ Summary(pt_BR.UTF-8): Biblioteca MPEG SDL Summary(ru.UTF-8): SDL MPEG библиотека и проигрыватель Summary(uk.UTF-8): SDL MPEG бібліотека та програвач Name: smpeg -Version: 0.4.4 -Release: 18 -License: LGPL +Version: 0.4.5 +Release: 1 +License: LGPL v2+ Group: Libraries -# currently developed at http://icculus.org/smpeg/ but no release yet -Source0: ftp://sunsite.dk/pub/os/linux/loki/open-source/smpeg/%{name}-%{version}.tar.gz -# Source0-md5: 59c76ac704088ef5539210190c4e1fe3 +Source0: http://www.libsdl.org/projects/SDL_mixer/libs/old/%{name}-%{version}.zip +# Source0-md5: ab48e149eed296072efd8865e53ec374 Source1: gtv.desktop Source2: gtv.png Patch0: %{name}-acfix.patch -Patch1: %{name}-gcc.patch -Patch2: %{name}-optimize.patch -Patch3: %{name}-am18.patch -Patch4: %{name}-gcc4.patch -Patch5: %{name}-gnu-stack.patch -Patch6: %{name}-fPIC.patch -Patch7: format-security.patch -URL: http://www.lokigames.com/development/smpeg.php3 +Patch1: %{name}-optimize.patch +Patch2: format-security.patch +URL: http://icculus.org/smpeg/ +BuildRequires: OpenGL-GLU-devel BuildRequires: SDL-devel >= 1.2.0 BuildRequires: autoconf BuildRequires: automake -BuildRequires: gtk+-devel >= 1.2.1 +BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: libstdc++-devel -BuildRequires: libtool >= 2:1.4d +BuildRequires: libtool >= 2:1.5 +BuildRequires: pkgconfig Requires: %{name}-libs = %{version}-%{release} Obsoletes: libsmpeg0.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,8 +72,8 @@ Shared smpeg libraries. Współdzielone biblioteki smpeg. %package devel -Summary: Smpeg header files and development documentation -Summary(pl.UTF-8): Pliki nagłówkowe oraz dokumentacja do smpeg +Summary: Smpeg header files +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki smpeg Summary(pt_BR.UTF-8): Bibliotecas e arquivos de inclusão para desenvolvimento de aplicações SMPEG Summary(ru.UTF-8): Файлы, необходимые для разработки программ, использующих SMPEG Summary(uk.UTF-8): Файли, необхідні для розробки програм, що використовують SMPEG @@ -87,10 +83,10 @@ Requires: SDL-devel Obsoletes: libsmpeg0.4-devel %description devel -Header files and development documentation for smpeg. +Header files for smpeg library. %description devel -l pl.UTF-8 -Pliki nagłówkowe oraz dokumentacja do biblioteki smpeg. +Pliki nagłówkowe biblioteki smpeg. %description devel -l pt_BR.UTF-8 Bibliotecas e arquivos de inclusão para desenvolvimento de aplicações @@ -105,8 +101,8 @@ SMPEG. использующих SMPEG. %package static -Summary: Smpeg static libraries -Summary(pl.UTF-8): Biblioteki statyczne smpeg +Summary: Smpeg static library +Summary(pl.UTF-8): Biblioteka statyczna smpeg Summary(pt_BR.UTF-8): Bibliotecas estáticas para desenvolvimento de aplicações SMPEG Summary(ru.UTF-8): Статические библиотеки для разработки с использованием SMPEG Summary(uk.UTF-8): Статичні бібліотеки для розробки з використанням SMPEG @@ -114,15 +110,14 @@ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static -Smpeg static libraries. +Smpeg static library. %description static -l pl.UTF-8 -Biblioteki statyczne smpeg. +Biblioteka statyczna smpeg. %description static -l pt_BR.UTF-8 Bibliotecas estáticas para desenvolvimento de aplicações SMPEG. - %description static -l ru.UTF-8 Этот пакет содержит статические библиотеки для разработки программ, использующих SMPEG. @@ -131,49 +126,51 @@ Bibliotecas estáticas para desenvolvimento de aplicações SMPEG. Цей пакет містить статичні бібліотеки для розробки програм, що використовують SMPEG. +%package glmovie +Summary: glmovie - OpenGL based MPEG player +Summary(pl.UTF-8): glmovie - odtwarzacz MPEG oparty na OpenGL-u. +Group: X11/Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description glmovie +glmovie - OpenGL based MPEG player. + +%description glmovie -l pl.UTF-8 +glmovie - odtwarzacz MPEG oparty na OpenGL-u. + %package gtv -Summary: gtv MPEG player -Summary(pl.UTF-8): Odtwarzacz MPEG gtv +Summary: gtv - GTK+ based MPEG player +Summary(pl.UTF-8): gtv - odtwarzacz MPEG oparty na GTK+ Group: X11/Applications/Multimedia Requires: %{name} = %{version}-%{release} %description gtv -gtv MPEG player. +gtv - GTK+ based MPEG player. %description gtv -l pl.UTF-8 -Odtwarzacz MPEG gtv. +gtv - odtwarzacz MPEG oparty na GTK+. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 -%patch7 -p1 -# get only AC_TYPE_SOCKLEN_T, kill the rest (libtool.m4 in particular) -tail -n 23 acinclude.m4 > acinc.tmp -mv -f acinc.tmp acinclude.m4 +%{__rm} acinclude/{libtool,lt*}.m4 %build %{__libtoolize} -%{__aclocal} +%{__aclocal} -I acinclude %{__autoconf} %{__automake} -CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" +CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions" %configure \ %ifarch %{ix86} --enable-mmx \ %endif - --disable-debug \ - --disable-opengl-player + --disable-debug -%{__make} \ - CC="%{__cxx}" \ - CCASFLAGS="\$(CFLAGS)" +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -194,30 +191,34 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGES README +%doc CHANGES README README.SDL_mixer TODO %attr(755,root,root) %{_bindir}/plaympeg %{_mandir}/man1/plaympeg.1* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libsmpeg-0.4.so.*.* +%attr(755,root,root) %{_libdir}/libsmpeg-0.4.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsmpeg-0.4.so.0 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/smpeg-config %attr(755,root,root) %{_libdir}/libsmpeg.so -%{_libdir}/lib*.la -%{_includedir}/* -%{_aclocaldir}/* +%{_libdir}/libsmpeg.la +%{_includedir}/smpeg +%{_aclocaldir}/smpeg.m4 %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libsmpeg.a + +%files glmovie +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/glmovie %files gtv %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gtv -%{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%{_desktopdir}/gtv.desktop +%{_pixmapsdir}/gtv.png %{_mandir}/man1/gtv.1* -- 2.44.0