Merge pull request #127 from ayhanyalcinsoy/master

some of gst deps
This commit is contained in:
Ertuğrul Erata
2015-07-23 17:41:04 +03:00
36 changed files with 2010 additions and 0 deletions
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
autotools.autoreconf("-vfi")
autotools.configure("--enable-shared \
--disable-static \
--enable-djbfft")
def build():
autotools.make('CFLAGS="%s"' % get.CFLAGS())
def install():
autotools.rawInstall('DESTDIR="%s" docdir=/%s/%s/html' % (get.installDIR(), get.docDIR(), get.srcNAME()))
pisitools.insinto("/usr/include/a52dec", "liba52/a52_internal.h")
pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "doc/liba52.txt")
@@ -0,0 +1,30 @@
diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
--- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800
+++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800
@@ -1,4 +1,4 @@
-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
+AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
lib_LTLIBRARIES = liba52.la
diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
--- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800
+++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800
@@ -2,7 +2,7 @@
AC_SUBST([LIBA52_LIBS])
dnl avoid -fPIC when possible
-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
AC_ARG_ENABLE([double],
[ --enable-double use double-precision samples])
diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
--- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700
+++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800
@@ -1,4 +1,4 @@
-CFLAGS = @A52DEC_CFLAGS@
+AM_CFLAGS = @A52DEC_CFLAGS@
bin_PROGRAMS = a52dec extract_a52
a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
@@ -0,0 +1,299 @@
Index: a52dec-0.7.4/liba52/bit_allocate.c
===================================================================
--- a52dec-0.7.4.orig/liba52/bit_allocate.c
+++ a52dec-0.7.4/liba52/bit_allocate.c
@@ -28,7 +28,7 @@
#include "a52.h"
#include "a52_internal.h"
-static int hthtab[3][50] = {
+static const int hthtab[3][50] = {
{0x730, 0x730, 0x7c0, 0x800, 0x820, 0x840, 0x850, 0x850, 0x860, 0x860,
0x860, 0x860, 0x860, 0x870, 0x870, 0x870, 0x880, 0x880, 0x890, 0x890,
0x8a0, 0x8a0, 0x8b0, 0x8b0, 0x8c0, 0x8c0, 0x8d0, 0x8e0, 0x8f0, 0x900,
@@ -46,7 +46,7 @@ static int hthtab[3][50] = {
0x8d0, 0x8b0, 0x840, 0x7f0, 0x790, 0x760, 0x7a0, 0x7c0, 0x7b0, 0x720}
};
-static int8_t baptab[305] = {
+static const int8_t baptab[305] = {
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
@@ -71,11 +71,11 @@ static int8_t baptab[305] = {
0, 0, 0, 0 /* 148 padding elems */
};
-static int bndtab[30] = {21, 22, 23, 24, 25, 26, 27, 28, 31, 34,
+static const int bndtab[30] = {21, 22, 23, 24, 25, 26, 27, 28, 31, 34,
37, 40, 43, 46, 49, 55, 61, 67, 73, 79,
85, 97, 109, 121, 133, 157, 181, 205, 229, 253};
-static int8_t latab[256] = {
+static const int8_t latab[256] = {
-64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53,
-52, -52, -51, -50, -49, -48, -47, -47, -46, -45, -44, -44,
-43, -42, -41, -41, -40, -39, -38, -38, -37, -36, -36, -35,
@@ -125,9 +125,9 @@ void a52_bit_allocate (a52_state_t * sta
int start, int end, int fastleak, int slowleak,
expbap_t * expbap)
{
- static int slowgain[4] = {0x540, 0x4d8, 0x478, 0x410};
- static int dbpbtab[4] = {0xc00, 0x500, 0x300, 0x100};
- static int floortab[8] = {0x910, 0x950, 0x990, 0x9d0,
+ static const int slowgain[4] = {0x540, 0x4d8, 0x478, 0x410};
+ static const int dbpbtab[4] = {0xc00, 0x500, 0x300, 0x100};
+ static const int floortab[8] = {0x910, 0x950, 0x990, 0x9d0,
0xa10, 0xa90, 0xb10, 0x1400};
int i, j;
@@ -135,8 +135,8 @@ void a52_bit_allocate (a52_state_t * sta
int8_t * bap;
int fdecay, fgain, sdecay, sgain, dbknee, floor, snroffset;
int psd, mask;
- int8_t * deltba;
- int * hth;
+ const int8_t * deltba;
+ const int * hth;
int halfrate;
halfrate = state->halfrate;
Index: a52dec-0.7.4/liba52/imdct.c
===================================================================
--- a52dec-0.7.4.orig/liba52/imdct.c
+++ a52dec-0.7.4/liba52/imdct.c
@@ -56,6 +56,7 @@ static uint8_t fftorder[] = {
6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
};
+#ifndef HARDCODED_TABLES
/* Root values for IFFT */
static sample_t roots16[3];
static sample_t roots32[7];
@@ -69,6 +70,13 @@ static complex_t pre2[64];
static complex_t post2[32];
static sample_t a52_imdct_window[256];
+#else
+# ifdef LIBA52_DOUBLE
+# include "imdct_tables_double.h"
+# else
+# include "imdct_tables_float.h"
+# endif
+#endif
static void (* ifft128) (complex_t * buf);
static void (* ifft64) (complex_t * buf);
@@ -178,7 +186,7 @@ static inline void ifft8 (complex_t * bu
BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
}
-static void ifft_pass (complex_t * buf, sample_t * weight, int n)
+static void ifft_pass (complex_t * buf, const sample_t * weight, int n)
{
complex_t * buf1;
complex_t * buf2;
@@ -351,6 +359,7 @@ void a52_imdct_256(sample_t * data, samp
}
}
+#ifndef HARDCODED_TABLES
static double besselI0 (double x)
{
double bessel = 1;
@@ -361,9 +370,11 @@ static double besselI0 (double x)
while (--i);
return bessel;
}
+#endif
void a52_imdct_init (uint32_t mm_accel)
{
+#ifndef HARDCODED_TABLES
int i, k;
double sum;
@@ -416,6 +427,7 @@ void a52_imdct_init (uint32_t mm_accel)
post2[i].real = cos ((M_PI / 128) * (i + 0.5));
post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
}
+#endif
#ifdef LIBA52_DJBFFT
if (mm_accel & MM_ACCEL_DJBFFT) {
Index: a52dec-0.7.4/liba52/imdct-gentables.c
===================================================================
--- /dev/null
+++ a52dec-0.7.4/liba52/imdct-gentables.c
@@ -0,0 +1,139 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <math.h>
+
+#ifndef LIBA52_DOUBLE
+typedef float sample_t;
+#else
+typedef double sample_t;
+#endif
+
+typedef struct complex_s {
+ sample_t real;
+ sample_t imag;
+} complex_t;
+
+static uint8_t fftorder[] = {
+ 0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176,
+ 8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88,
+ 4,132, 68,196, 36,164,228,100, 20,148, 84,212,244,116, 52,180,
+ 252,124, 60,188, 28,156,220, 92, 12,140, 76,204,236,108, 44,172,
+ 2,130, 66,194, 34,162,226, 98, 18,146, 82,210,242,114, 50,178,
+ 10,138, 74,202, 42,170,234,106,250,122, 58,186, 26,154,218, 90,
+ 254,126, 62,190, 30,158,222, 94, 14,142, 78,206,238,110, 46,174,
+ 6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
+};
+
+/* Root values for IFFT */
+static sample_t roots16[3];
+static sample_t roots32[7];
+static sample_t roots64[15];
+static sample_t roots128[31];
+
+/* Twiddle factors for IMDCT */
+static complex_t pre1[128];
+static complex_t post1[64];
+static complex_t pre2[64];
+static complex_t post2[32];
+
+static sample_t a52_imdct_window[256];
+
+static double besselI0 (double x)
+{
+ double bessel = 1;
+ int i = 100;
+
+ do
+ bessel = bessel * x / (i * i) + 1;
+ while (--i);
+ return bessel;
+}
+
+int main() {
+ int i, k;
+ double sum;
+
+ /* compute imdct window - kaiser-bessel derived window, alpha = 5.0 */
+ sum = 0;
+ for (i = 0; i < 256; i++) {
+ sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256));
+ a52_imdct_window[i] = sum;
+ }
+ sum++;
+ for (i = 0; i < 256; i++)
+ a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum);
+
+ for (i = 0; i < 3; i++)
+ roots16[i] = cos ((M_PI / 8) * (i + 1));
+
+ for (i = 0; i < 7; i++)
+ roots32[i] = cos ((M_PI / 16) * (i + 1));
+
+ for (i = 0; i < 15; i++)
+ roots64[i] = cos ((M_PI / 32) * (i + 1));
+
+ for (i = 0; i < 31; i++)
+ roots128[i] = cos ((M_PI / 64) * (i + 1));
+
+ for (i = 0; i < 64; i++) {
+ k = fftorder[i] / 2 + 64;
+ pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
+ pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
+ }
+
+ for (i = 64; i < 128; i++) {
+ k = fftorder[i] / 2 + 64;
+ pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
+ pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
+ }
+
+ for (i = 0; i < 64; i++) {
+ post1[i].real = cos ((M_PI / 256) * (i + 0.5));
+ post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
+ }
+
+ for (i = 0; i < 64; i++) {
+ k = fftorder[i] / 4;
+ pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
+ pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
+ }
+
+ for (i = 0; i < 32; i++) {
+ post2[i].real = cos ((M_PI / 128) * (i + 0.5));
+ post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
+ }
+
+#define print_table_samples(name, size) \
+ do { \
+ int i; \
+ printf("static const sample_t " #name "[" #size "] = {\n"); \
+ for(i = 0; i < size; i++) { \
+ printf(" %a%s\n", name[i], i < size-1 ? ", " : ""); \
+ } \
+ printf("\n};\n\n"); \
+ } while(0);
+
+#define print_table_complex(name, size) \
+ do { \
+ int i; \
+ printf("static const complex_t " #name "[" #size "] = {\n"); \
+ for(i = 0; i < size; i++) { \
+ printf(" { %a, %a }%s\n", name[i].real, name[i].imag, i < size-1 ? ", " : ""); \
+ } \
+ printf("\n};\n\n"); \
+ } while(0);
+
+ print_table_samples(roots16, 3);
+ print_table_samples(roots32, 7);
+ print_table_samples(roots64, 15);
+ print_table_samples(roots128, 31);
+
+ print_table_complex(pre1, 128);
+ print_table_complex(post1, 64);
+ print_table_complex(pre2, 64);
+ print_table_complex(post2, 32);
+
+ print_table_samples(a52_imdct_window, 256);
+
+ return 0;
+}
Index: a52dec-0.7.4/liba52/Makefile.am
===================================================================
--- a52dec-0.7.4.orig/liba52/Makefile.am
+++ a52dec-0.7.4/liba52/Makefile.am
@@ -2,8 +2,26 @@ CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
lib_LTLIBRARIES = liba52.la
-liba52_la_SOURCES = bitstream.c imdct.c bit_allocate.c parse.c downmix.c
+liba52_la_SOURCES = bitstream.c imdct.c bit_allocate.c parse.c downmix.c imdct_tables_double.h imdct_tables_float.h
liba52_la_LIBADD = @LIBA52_LIBS@ -lm
liba52_la_LDFLAGS = -no-undefined
+noinst_PROGRAMS = imdct-gentables-double imdct-gentables-float
+
+imdct_gentables_double_SOURCES = imdct-gentables.c
+imdct_gentables_double_CFLAGS = $(CFLAGS) -DLIBA52_DOUBLE
+imdct_gentables_double_LDADD = -lm
+
+imdct_gentables_float_SOURCES = imdct-gentables.c
+imdct_gentables_float_CFLAGS = $(CFLAGS) -ULIBA52_DOUBLE
+imdct_gentables_float_LDADD = -lm
+
+imdct_tables_double.h: imdct-gentables-double
+ ./$^ > $@
+
+imdct_tables_float.h: imdct-gentables-float
+ ./$^ > $@
+
+imdct.c: imdct_tables_double.h imdct_tables_float.h
+
EXTRA_DIST = configure.incl a52_internal.h bitstream.h tables.h
@@ -0,0 +1,20 @@
--- liba52/imdct.c 2002-07-28 04:52:07.000000000 +0300
+++ liba52/imdct.c 2007-05-01 17:41:11.000000000 +0300
@@ -418,15 +418,12 @@
}
#ifdef LIBA52_DJBFFT
- if (mm_accel & MM_ACCEL_DJBFFT) {
fprintf (stderr, "Using djbfft for IMDCT transform\n");
ifft128 = (void (*) (complex_t *)) fftc4_un128;
ifft64 = (void (*) (complex_t *)) fftc4_un64;
- } else
-#endif
- {
+#else
fprintf (stderr, "No accelerated IMDCT transform found\n");
ifft128 = ifft128_c;
ifft64 = ifft64_c;
- }
+#endif
}
+74
View File
@@ -0,0 +1,74 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>a52dec</Name>
<Homepage>http://liba52.sourceforge.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>DVD ATSC A/52 streams decoder library</Summary>
<Description>liba52 is a free library for decoding ATSC A/52 streams. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3.</Description>
<Archive sha1sum="79b33bd8d89dad7436f85b9154ad35667aa37321" type="targz">http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz</Archive>
<BuildDependencies>
<Dependency>glibc-devel</Dependency>
<Dependency>djbfft-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">a52dec-0.7.4-build.patch</Patch>
<Patch>use-djbfft.patch</Patch>
<Patch level="1">constant.patch</Patch>
</Patches>
</Source>
<Package>
<Name>a52dec</Name>
<RuntimeDependencies>
<Dependency>djbfft</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>a52dec-devel</Name>
<Summary>Development files for a52dec</Summary>
<RuntimeDependencies>
<Dependency release="current">a52dec</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-20</Date>
<Version>0.7.4</Version>
<Comment>Rebuild.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-01-31</Date>
<Version>0.7.4</Version>
<Comment>some fixes and rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-10-12</Date>
<Version>0.7.4</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>a52dec</Name>
<Summary xml:lang="tr">DVD'de kullanılan ATSC A/52 akımını çözen kütüphane</Summary>
<Description xml:lang="tr">liba52 ATSC A/52 yayınlarının kodlarını çözen ücretsiz bir kütüphanedir. A/52 standart dijital televizyon ve DVD programlarını da içeren çeşitli uygulamalar tarafından kullanılmaktadır.</Description>
</Source>
<Package>
<Name>a52dec-devel</Name>
<Summary xml:lang="tr">a52dec için geliştirme dosyaları</Summary>
</Package>
</PISI>
@@ -0,0 +1,27 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.configure("--disable-static \
--disable-esd \
--disable-rpath \
--with-package-name='PisiLinux gstreamer-plugins-good package' \
--with-package-origin='http://www.pisilinux.org' \
--disable-schemas-install")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
def install():
autotools.install()
pisitools.dodoc("AUTHORS", "README", "RELEASE")
@@ -0,0 +1,58 @@
From 4cd9255f0a8a9e15d81561f00f02d275b5095f70 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel (Alexey Fisher) <bug-track@fisher-privat.net>
Date: Thu, 01 Mar 2012 13:15:29 +0000
Subject: v4l2src: fix v4l2_munmap() for compressed formats
Make sure we always call munmap() with the same size we called mmap()
with before.
Current v4l2src uses the same structure for VIDIOC_QUERYBUF, VIDIOC_QBUF
and v4l2_munmap calls. The problem is that the video buffer size (length)
may vary for compressed or emulated bufs. VIDIOC_QBUF will change it if
we pass the pointer of a v4l2_buffer. This is why we should avoid using
same variable for mmap and video buffers.
https://bugzilla.gnome.org/show_bug.cgi?id=671126
---
(limited to 'sys/v4l2')
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index b81c6a4..51419ff 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -106,9 +106,9 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer * buffer)
if (!resuscitated) {
GST_LOG_OBJECT (pool->v4l2elem,
"buffer %p (data %p, len %u) not recovered, unmapping",
- buffer, GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
+ buffer, GST_BUFFER_DATA (buffer), buffer->mmap_length);
gst_mini_object_unref (GST_MINI_OBJECT (pool));
- v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
+ v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->mmap_length);
GST_MINI_OBJECT_CLASS (v4l2buffer_parent_class)->finalize (GST_MINI_OBJECT
(buffer));
@@ -183,6 +183,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
+ ret->mmap_length = ret->vbuffer.length;
data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
ret->vbuffer.m.offset);
diff --git a/sys/v4l2/gstv4l2bufferpool.h b/sys/v4l2/gstv4l2bufferpool.h
index caad9ac..36ea323 100644
--- a/sys/v4l2/gstv4l2bufferpool.h
+++ b/sys/v4l2/gstv4l2bufferpool.h
@@ -70,6 +70,9 @@ struct _GstV4l2Buffer {
GstBuffer buffer;
struct v4l2_buffer vbuffer;
+ /* warning: the size of mmap buffer and
+ * the actual frame-buffer can be different. */
+ size_t mmap_length;
/* FIXME: have GstV4l2Src* instead, as this has GstV4l2BufferPool* */
/* FIXME: do we really want to fix this if GstV4l2Buffer/Pool is shared
--
cgit v0.9.0.2-2-gbebe
@@ -0,0 +1,57 @@
From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 2 May 2013 16:16:46 -0400
Subject: [PATCH] sys/v4l2: Some blind compilation fixes
---
sys/v4l2/gstv4l2bufferpool.c | 1 -
sys/v4l2/v4l2_calls.c | 12 ++++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index a0b4c84..3916815 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
ret->vbuffer.m.offset);
GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
ret->mmap_length = ret->vbuffer.length;
data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index 309bfb6..ee3ff9f 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -53,14 +53,6 @@
#include "gst/gst-i18n-plugin.h"
-/* Those are ioctl calls */
-#ifndef V4L2_CID_HCENTER
-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
-#endif
-#ifndef V4L2_CID_VCENTER
-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
-#endif
-
GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
#define GST_CAT_DEFAULT v4l2_debug
@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
break;
case V4L2_CID_HFLIP:
case V4L2_CID_VFLIP:
+#ifdef V4L2_CID_HCENTER
case V4L2_CID_HCENTER:
+#endif
+#ifdef V4L2_CID_VCENTER
case V4L2_CID_VCENTER:
+#endif
#ifdef V4L2_CID_PAN_RESET
case V4L2_CID_PAN_RESET:
#endif
--
1.7.1
@@ -0,0 +1,27 @@
From 6f707fcbca2c60aed565247567bafdd168980161 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sat, 03 Mar 2012 13:04:48 +0000
Subject: v4l2: clear DISCONT flag when recycling buffers into the buffer pool
The base class may have set the DISCONT flag on the first buffer pushed
out. We need to clear that when recycling buffers back into the buffer
pool, otherwise we constantly push out buffers with the discont flag
set, which might upset downstream elements, esp. for compressed
formats like mpeg-ts.
---
(limited to 'sys/v4l2')
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 51419ff..a0b4c84 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -98,6 +98,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer * buffer)
GST_LOG_OBJECT (pool->v4l2elem, "reviving buffer %p, %d", buffer, index);
gst_buffer_ref (GST_BUFFER (buffer));
GST_BUFFER_SIZE (buffer) = 0;
+ GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT);
pool->buffers[index] = buffer;
}
--
cgit v0.9.0.2-2-gbebe
@@ -0,0 +1,28 @@
--- gst-plugins-good-0.10.31/sys/v4l2/gstv4l2object.c 2011-12-30 14:59:13.000000000 +0100
+++ gst-plugins-good-0.10.31.fixed/sys/v4l2/gstv4l2object.c 2012-06-05 23:45:16.670981047 +0200
@@ -1583,6 +1583,7 @@
if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
GValue rate = { 0, };
+ guint i;
g_value_init (&rates, GST_TYPE_LIST);
g_value_init (&rate, GST_TYPE_FRACTION);
@@ -1602,7 +1603,16 @@
/* swap to get the framerate */
gst_value_set_fraction (&rate, denom, num);
- gst_value_list_append_value (&rates, &rate);
+ /* avoid duplicate framerates, yes some hw reports duplicates :( */
+ for (i = 0; i < gst_value_list_get_size(&rates); i++) {
+ const GValue *val = gst_value_list_get_value(&rates, i);
+ if (gst_value_compare(val, &rate) == GST_VALUE_EQUAL) {
+ break;
+ }
+ }
+ if (i == gst_value_list_get_size(&rates)) {
+ gst_value_list_append_value(&rates, &rate);
+ }
ival.index++;
} while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
@@ -0,0 +1,46 @@
From fefa084bde0850447ca5ed84775c094fcf0b2351 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 8 Jun 2012 20:38:34 +0200
Subject: [PATCH] v4l2object: Don't probe UVC devices for being interlaced
UVC devices are never interlaced, and doing VIDIOC_TRY_FMT on them
causes expensive and slow USB IO, so don't probe them for interlaced.
This shaves 2 seconds of the startup time of cheese with a Logitech
Webcam Pro 9000.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
sys/v4l2/gstv4l2object.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 6564b91..ce52547 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -1561,10 +1561,18 @@ gst_v4l2_object_probe_caps_for_format_and_size (GstV4l2Object * v4l2object,
gint int_width = width;
gint int_height = height;
- /* interlaced detection using VIDIOC_TRY/S_FMT */
- if (!gst_v4l2_object_get_nearest_size (v4l2object, pixelformat,
- &int_width, &int_height, &interlaced))
- return NULL;
+ if (!strcmp((char *)v4l2object->vcap.driver, "uvcvideo")) {
+ /*
+ * UVC devices are never interlaced, and doing VIDIOC_TRY_FMT on them
+ * causes expensive and slow USB IO, so don't probe them for interlaced
+ */
+ interlaced = FALSE;
+ } else {
+ /* Interlaced detection using VIDIOC_TRY/S_FMT */
+ if (!gst_v4l2_object_get_nearest_size (v4l2object, pixelformat,
+ &int_width, &int_height, &interlaced))
+ return NULL;
+ }
memset (&ival, 0, sizeof (struct v4l2_frmivalenum));
ival.index = 0;
--
1.7.10.2
+145
View File
@@ -0,0 +1,145 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gst-plugins-good</Name>
<Homepage>http://gstreamer.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>A set of good-quality plugins for GStreamer</Summary>
<Description>gst-plugins-good contains a set of mature plugins and elements for GStreamer.</Description>
<Archive sha1sum="b45fc01b133fc23617fa501dd9307a90f467b396" type="tarbz2">http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>flac-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>libsoup-devel</Dependency>
<Dependency>libvpx-devel</Dependency>
<Dependency>aalib-devel</Dependency>
<Dependency>libraw1394-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>libv4l-devel</Dependency>
<Dependency>libsoup-gnome</Dependency>
<Dependency>speex-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>orc-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>valgrind</Dependency>
<Dependency>libXdamage-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXv-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>libtheora-devel</Dependency>
<Dependency>libogg-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<!--<Dependency>libiec61883-devel</Dependency>
<Dependency>libavc1394-devel</Dependency>
<Dependency>libcaca-devel</Dependency>
<Dependency>wavpack-devel</Dependency>
<Dependency>libshout-devel</Dependency>
<Dependency>libdv-devel</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>jack-audio-connection-kit-devel</Dependency>
<Dependency>libproxy-devel</Dependency>-->
</BuildDependencies>
<Patches>
<Patch level="1">0001-fix-v4l2_munmap.patch</Patch>
<Patch level="1">0002-clear_DISCONT_flag.patch</Patch>
<Patch level="1">0003-v4l2src-fix.patch</Patch>
<Patch level="1">0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch</Patch>
<Patch level="1">0001-sys-v4l2-Some-blind-compilation-fixes.patch</Patch>
</Patches>
</Source>
<Package>
<Name>gst-plugins-good</Name>
<RuntimeDependencies>
<Dependency>orc</Dependency>
<Dependency>flac</Dependency>
<Dependency>zlib</Dependency>
<Dependency>speex</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libpng</Dependency>
<Dependency>libXv</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>aalib</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>libv4l</Dependency>
<Dependency>libsoup</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libXext</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>libsoup-gnome</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>gst-plugins-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/gconf</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/gstreamer-0.10/presets</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2014-05-28</Date>
<Version>0.10.31</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-02-27</Date>
<Version>0.10.31</Version>
<Comment>Rebuild Unused</Comment>
<Name>Varol Maksutoğlu</Name>
<Email>waroi@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-0-26</Date>
<Version>0.10.31</Version>
<Comment>Rebuild</Comment>
<Name>Erdinç Gültekin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-28</Date>
<Version>0.10.31</Version>
<Comment>missing dep.</Comment>
<Name>Erdinç Gültekin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-05-09</Date>
<Version>0.10.31</Version>
<Comment>rebuild for libv4l</Comment>
<Name>Erdinç Gültekin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-11-09</Date>
<Version>0.10.31</Version>
<Comment>First release</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gst-plugins-good</Name>
<Summary xml:lang="tr">Gstreamer için temel eklentiler paketi</Summary>
<Summary xml:lang="fr">Ensemble de plug-ins (greffons) de bonne qualité sous la licence préférée de gstreamer.</Summary>
</Source>
</PISI>
@@ -0,0 +1,35 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("AUTOPOINT", "true")
autotools.autoreconf("-vfi")
# sidplay is in contrib.
autotools.configure("--disable-static \
--enable-experimental \
--with-package-name=\"PisiLinux gstreamer-plugins-ugly package\" \
--with-package-origin=\"http://www.pisilinux.org/eng\"")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
# causes sandbox violations
#def check():
# # causes sandbox violation
# autotools.make("-C tests/check check")
def install():
autotools.install()
pisitools.dodoc("README", "COPYING", "AUTHORS", "NEWS")
@@ -0,0 +1,117 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gst-plugins-ugly-next</Name>
<Homepage>http://gstreamer.net/</Homepage>
<Packager>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>Other plugins for gstreamer</Summary>
<Description>GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and correct functionality, but distributing them might pose problems. The license on either the plugins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems.</Description>
<Archive sha1sum="7f076929330cff49cd909fd4f94d3fce52a81e36" type="tarxz">http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz</Archive>
<BuildDependencies>
<Dependency>gst-plugins-base-next-devel</Dependency>
<Dependency>gstreamer-next-devel</Dependency>
<Dependency>x264-devel</Dependency>
<Dependency>lame-devel</Dependency>
<Dependency>opencore-amr-devel</Dependency>
<Dependency>a52dec-devel</Dependency>
<Dependency>libmad-devel</Dependency>
<!--<Dependency>twolame-devel</Dependency>-->
<Dependency>libcdio-devel</Dependency>
<Dependency>libmpeg2-devel</Dependency>
<Dependency>libdvdcss-devel</Dependency>
<Dependency>libid3tag-devel</Dependency>
<Dependency>libdvdread-devel</Dependency>
<Dependency>orc-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>gst-plugins-ugly-next</Name>
<RuntimeDependencies>
<Dependency>gst-plugins-base-next</Dependency>
<Dependency>gstreamer-next</Dependency>
<Dependency>x264</Dependency>
<Dependency>glib2</Dependency>
<Dependency>lame</Dependency>
<Dependency>opencore-amr</Dependency>
<Dependency>a52dec</Dependency>
<Dependency>libmad</Dependency>
<Dependency>libcdio</Dependency>
<Dependency>libmpeg2</Dependency>
<Dependency>libdvdread</Dependency>
<Dependency>orc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/gstreamer-1.0</Path>
<Path fileType="doc">/usr/share/doc/</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/gst-plugins-ugly-plugins-1.0</Path>
<Path fileType="data">/usr/share/gstreamer-1.0</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<History>
<Update release="8">
<Date>2015-04-18</Date>
<Version>1.4.5</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2014-08-22</Date>
<Version>1.4.0</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-05-28</Date>
<Version>1.2.4</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-04-07</Date>
<Version>1.2.3</Version>
<Comment>Rebuild for x264.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-02-14</Date>
<Version>1.2.3</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-11-23</Date>
<Version>1.2.1</Version>
<Comment>version bump</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-10-14</Date>
<Version>1.2.0</Version>
<Comment>version bump</Comment>
<Name>Erdinç Gültekin</Name>
<Email>erdincgultekin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-08-30</Date>
<Version>1.1.4</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,9 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gst-plugins-ugly</Name>
<Summary xml:lang="tr">Gstreamer için diğer eklentiler</Summary>
<Description xml:lang="tr">GStreamer Ugly Plug-in'leri kaliteli ve güzel çalışan eklentiler içerir. Fakat bu eklentilerin lisanslarla ilgili sorunları bulunabilir.</Description>
<Description xml:lang="fr">les Plug-ins (greffons) Ugly (horribles) de GStreamer est un ensemble de plug-ins de bonne qualité et fonctionnant correctement, mais dont la distribution pose problème. La licence du plug-in ou de librairies nécessaires au plug-in n'est pas forcément tel que l'on aimerait qu'elle soit. Le code peut également être notoirement connu pour présenter un problème patent.</Description>
</Source>
</PISI>
@@ -0,0 +1,36 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("AUTOPOINT", "true")
autotools.autoreconf("-vfi")
# sidplay is in contrib.
autotools.configure("--disable-static \
--disable-rpath \
--disable-sidplay \
--with-package-name=\"PisiLinux gstreamer-plugins-ugly package\" \
--with-package-origin=\"http://www.pisilinux.org/eng\"")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
# causes sandbox violations
#def check():
# # causes sandbox violation
# autotools.make("-C tests/check check")
def install():
autotools.install()
pisitools.dodoc("README", "COPYING", "AUTHORS", "NEWS")
@@ -0,0 +1,183 @@
From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001
From: Leon Merten Lohse <leon@green-side.de>
Date: Thu, 03 May 2012 22:50:30 +0000
Subject: cdio: compensate for libcdio's recent cd-text api changes
https://bugzilla.gnome.org/show_bug.cgi?id=675112
Conflicts:
ext/cdio/gstcdiocddasrc.c
---
diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
index 2f58d18..483ebf5 100644
--- a/ext/cdio/gstcdio.c
+++ b/ext/cdio/gstcdio.c
@@ -30,12 +30,16 @@
GST_DEBUG_CATEGORY (gst_cdio_debug);
void
-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
{
const gchar *txt;
+#if LIBCDIO_VERSION_NUM > 83
+ txt = cdtext_get_const (cdtext, field, track);
+#else
txt = cdtext_get_const (field, cdtext);
+#endif
if (txt == NULL || *txt == '\0') {
GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
return;
@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
}
GstTagList *
+#if LIBCDIO_VERSION_NUM > 83
+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
+{
+ GstTagList *tags = NULL;
+
+#else
gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
{
GstTagList *tags = NULL;
@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
return NULL;
}
+#endif
- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
+ GST_TAG_ARTIST, &tags);
+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
+ &tags);
return tags;
}
void
+#if LIBCDIO_VERSION_NUM > 83
+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
+ GstTagList * tags)
+{
+#else
gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
{
cdtext_t *t;
@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
return;
}
+#endif
- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
-
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
+ GST_TAG_ALBUM_ARTIST, &tags);
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
+ &tags);
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
+ &tags);
GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
}
diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
index ef31ed0..c6da580 100644
--- a/ext/cdio/gstcdio.h
+++ b/ext/cdio/gstcdio.h
@@ -24,22 +24,38 @@
#include <gst/gst.h>
#include <cdio/cdio.h>
#include <cdio/cdtext.h>
+#include <cdio/version.h>
+
+#if LIBCDIO_VERSION_NUM <= 83
+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE
+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE
+#endif
GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
#define GST_CAT_DEFAULT gst_cdio_debug
void gst_cdio_add_cdtext_field (GstObject * src,
cdtext_t * cdtext,
+ track_t track,
cdtext_field_t field,
const gchar * gst_tag,
GstTagList ** p_tags);
GstTagList * gst_cdio_get_cdtext (GstObject * src,
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t * t,
+#else
CdIo * cdio,
+#endif
track_t track);
void gst_cdio_add_cdtext_album_tags (GstObject * src,
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t * t,
+#else
CdIo * cdio,
+#endif
GstTagList * tags);
#endif /* __GST_CDIO_H__ */
diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
index 615a0c8..830839e 100644
--- a/ext/cdio/gstcdiocddasrc.c
+++ b/ext/cdio/gstcdiocddasrc.c
@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
GstCdioCddaSrc *src;
discmode_t discmode;
gint first_track, num_tracks, i;
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t *cdtext;
+#endif
src = GST_CDIO_CDDA_SRC (audiocdsrc);
@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
if (src->read_speed != -1)
cdio_set_speed (src->cdio, src->read_speed);
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext = cdio_get_cdtext (src->cdio);
+
+ if (NULL == cdtext)
+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
+ else
+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
+ cddabasesrc->tags);
+#else
gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
cddabasesrc->tags);
+#endif
GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
* the right thing here (for cddb id calculations etc. as well) */
track.start = cdio_get_track_lsn (src->cdio, i + first_track);
track.end = track.start + len_sectors - 1; /* -1? */
+#if LIBCDIO_VERSION_NUM > 83
+ if (NULL != cdtext)
+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
+ i + first_track);
+#else
track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
i + first_track);
+#endif
gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
}
--
cgit v0.9.0.2-2-gbebe
@@ -0,0 +1,34 @@
--- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000
+++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000
@@ -22,7 +22,7 @@
#include <gst/gst.h>
#include <gst/audio/gstaudiodecoder.h>
-#include <interf_dec.h>
+#include <opencore-amrnb/interf_dec.h>
G_BEGIN_DECLS
--- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000
+++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000
@@ -21,7 +21,7 @@
#define __GST_AMRNBENC_H__
#include <gst/gst.h>
-#include <interf_enc.h>
+#include <opencore-amrnb/interf_enc.h>
#include <gst/audio/gstaudioencoder.h>
G_BEGIN_DECLS
--- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000
+++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000
@@ -22,8 +22,8 @@
#include <gst/gst.h>
#include <gst/audio/gstaudiodecoder.h>
-#include <dec_if.h>
-#include <if_rom.h>
+#include <opencore-amrwb/dec_if.h>
+#include <opencore-amrwb/if_rom.h>
G_BEGIN_DECLS
+112
View File
@@ -0,0 +1,112 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gst-plugins-ugly</Name>
<Homepage>http://gstreamer.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>Other plugins for gstreamer</Summary>
<Description>GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and correct functionality, but distributing them might pose problems. The license on either the plugins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems.</Description>
<Archive sha1sum="a28e4e8962f1fe385a098b13249a2b817c44fe63" type="tarbz2">http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.bz2</Archive>
<BuildDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>gstreamermm-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>libdvdread-devel</Dependency>
<Dependency releaseFrom="2">x264-devel</Dependency>
<Dependency>orc-devel</Dependency>
<Dependency>lame-devel</Dependency>
<Dependency>opencore-amr-devel</Dependency>
<Dependency>a52dec-devel</Dependency>
<Dependency>libmad-devel</Dependency>
<Dependency versionFrom="0.90">libcdio-devel</Dependency>
<Dependency>libmpeg2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">cdio-cd-text-api.patch</Patch>
<Patch>opencore-amr.patch</Patch>
</Patches>
</Source>
<Package>
<Name>gst-plugins-ugly</Name>
<RuntimeDependencies>
<Dependency>orc</Dependency>
<Dependency>glib2</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency releaseFrom="2">x264</Dependency>
<Dependency>lame</Dependency>
<Dependency>opencore-amr</Dependency>
<Dependency>a52dec</Dependency>
<Dependency>libmad</Dependency>
<Dependency versionFrom="0.90">libcdio</Dependency>
<Dependency>libmpeg2</Dependency>
<Dependency>libdvdread</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/gstreamer-0.10</Path>
<Path fileType="doc">/usr/share/doc/gst-plugins-ugly</Path>
<Path fileType="data">/usr/share/gstreamer-0.10</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<History>
<Update release="7">
<Date>2014-05-28</Date>
<Version>0.10.19</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-04-05</Date>
<Version>0.10.19</Version>
<Comment>Rebuild for x264</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-02-27</Date>
<Version>0.10.19</Version>
<Comment>Rebuild Unused</Comment>
<Name>Varol Maksutoğlu</Name>
<Email>waroi@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-02-26</Date>
<Version>0.10.19</Version>
<Comment>Rebuild</Comment>
<Name>Erdinç Gültekin</Name>
<Email>erdincgultekin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-28</Date>
<Version>0.10.19</Version>
<Comment>missing dep</Comment>
<Name>Erdinç Gültekin</Name>
<Email>erdincgultekin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-07</Date>
<Version>0.10.19</Version>
<Comment>Rebuild for libcdio and x264</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-10-10</Date>
<Version>0.10.19</Version>
<Comment>First release</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,9 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gst-plugins-ugly</Name>
<Summary xml:lang="tr">Gstreamer için diğer eklentiler</Summary>
<Description xml:lang="tr">GStreamer Ugly Plug-in'leri kaliteli ve güzel çalışan eklentiler içerir. Fakat bu eklentilerin lisanslarla ilgili sorunları bulunabilir.</Description>
<Description xml:lang="fr">les Plug-ins (greffons) Ugly (horribles) de GStreamer est un ensemble de plug-ins de bonne qualité et fonctionnant correctement, mais dont la distribution pose problème. La licence du plug-in ou de librairies nécessaires au plug-in n'est pas forcément tel que l'on aimerait qu'elle soit. Le code peut également être notoirement connu pour présenter un problème patent.</Description>
</Source>
</PISI>
+29
View File
@@ -0,0 +1,29 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import libtools
from pisi.actionsapi import get
def setup():
autotools.autoreconf("-fi")
autotools.configure("--enable-shared \
--disable-dependency-tracking \
--disable-static \
--disable-sdl \
--without-x")
def build():
autotools.make('OPT_CFLAGS="%s" \
MPEG2DEC_CFLAGS="%s" \
LIBMPEG2_CFLAGS=""' % (get.CFLAGS(), get.CFLAGS()))
def install():
autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "TODO")
@@ -0,0 +1,26 @@
--- test/globals.orig 2006-04-29 19:19:59.000000000 +0200
+++ test/globals 2006-04-29 19:24:35.000000000 +0200
@@ -14,8 +14,9 @@
error=0
-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\
- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'`
+bad_globals=`readelf -s $builddir/../libmpeg2/*.o |\
+ awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
+ grep -v '^_\?mpeg2_'`
if test x"$bad_globals" != x""; then
echo BAD GLOBAL SYMBOLS:
@@ -23,8 +24,9 @@
error=1
fi
-bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\
- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'`
+bad_globals=`readelf -s $builddir/../libmpeg2/convert/*.o |\
+ awk '$5=="GLOBAL" && $6!="HIDDEN" && $7!="UND" {print $8}' |\
+ grep -v '^_\?mpeg2convert_'`
if test x"$bad_globals" != x""; then
echo BAD GLOBAL SYMBOLS:
+66
View File
@@ -0,0 +1,66 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libmpeg2</Name>
<Homepage>http://libmpeg2.sourceforge.net/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>libmpeg2 is a free library for decoding mpeg-2 and mpeg-1 video streams</Summary>
<Description>libmpeg2 is a free library for decoding mpeg-2 and mpeg-1 video streams. libmpeg2 is able to decode all mpeg streams that conform to certain restrictions: "constrained parameters" for mpeg-1, and "main profile" for mpeg-2.</Description>
<Archive sha1sum="0f9163d8fd52db5f577ebe45636f674252641fd7" type="targz">http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz</Archive>
<Patches>
<Patch>libmpeg2-0.4.1-use-readelf-for-test.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libmpeg2</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libmpeg2-devel</Name>
<Summary>Development files for libmpeg2</Summary>
<RuntimeDependencies>
<Dependency release="current">libmpeg2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-25</Date>
<Version>0.5.1</Version>
<Comment>Rebuild</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="2">
<Date>2014-01-31</Date>
<Version>0.5.1</Version>
<Comment>Rebuild</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-10-12</Date>
<Version>0.5.1</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,15 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libmpeg2</Name>
<Summary xml:lang="tr">mpeg-2 ve mpeg-1 video görüntülerini çözmek için ücretsiz bir kütüphane</Summary>
<Description xml:lang="tr">libmpeg2, mpeg-1 ve mpeg-2 video akışlarının çözülerek okunması için ücretsiz bir kütüphanedir. Libmpeg-2, bir takım kısıtlayıcı kurallara (mpeg-1 için &quot;kısıtlanmış parametreler&quot; ve mpeg-2 için &quot;ana profil&quot;) uyan bütün mpeg yayınlarını çözebilir.</Description>
<Description xml:lang="fr">libmpeg2 est une librairie libre pour décoder les flux vidéos mpeg-2 et mpeg-1. libmpeg2 est capable de décoder tous les flux vidéos se conformant à certaines restrictions : &quot;paramètres contraints (constrained parameters)&quot; pour mpeg-1 et &quot;profil principal (main profile)&quot; pour mpeg-2.</Description>
<Description xml:lang="es">libmpeg2 es una librería libre para decodificar flujos de video mpeg-2 y mpeg-1. libmpeg2 puede decodificar todo tipo de flujos mpeg que cumplen ciertos restricciones: &quot;constrained parameters&quot; para mpeg-1, y &quot;main profile&quot; para mpeg-2.</Description>
</Source>
<Package>
<Name>libmpeg2-devel</Name>
<Summary xml:lang="tr">libmpeg2 için geliştirme dosyaları</Summary>
</Package>
</PISI>
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
lib_version=get.srcVERSION()[0] + "." + get.srcVERSION()[2] + "." + get.srcVERSION()[3]
def setup():
# FIXME: shelltools.echo() appends to the end of the file by default so clear them first
shelltools.unlink('conf-cc')
shelltools.unlink('conf-ld')
shelltools.unlink('conf-home')
shelltools.echo('conf-cc', "%s %s -malign-double -fPIC -DPIC" % (get.CC(), get.CFLAGS().replace("-D_FORTIFY_SOURCE=2", "").replace("-fomit-frame-pointer", "")))
shelltools.echo('conf-ld', "%s %s" % (get.CC(), get.LDFLAGS()))
shelltools.echo('conf-home', "%s/usr" % get.installDIR())
def build():
autotools.make('LIBDJBFFT="libdjbfft.so.%s" LIBPERMS="0755"' % lib_version)
def install():
pisitools.dolib("libdjbfft.so.%s" % lib_version)
pisitools.dosym("/usr/lib/libdjbfft.so.%s" % lib_version,"/usr/lib/libdjbfft.so")
pisitools.dosym("/usr/lib/libdjbfft.so.%s" % lib_version,"/usr/lib/libdjbfft.so.0")
for header in ["fftc4.h", "complex4.h", "real4.h"]:
pisitools.insinto("/usr/include", header)
pisitools.dodoc("CHANGES","README","TODO")
@@ -0,0 +1,37 @@
--- djbfft-0.76/install.c.orig 2003-04-25 23:31:34.000000000 +0200
+++ djbfft-0.76/install.c 2003-04-25 23:29:05.000000000 +0200
@@ -1,3 +1,4 @@
+#include <errno.h>
#include "substdio.h"
#include "strerr.h"
#include "error.h"
--- djbfft-0.76/instcheck.c.orig 2003-04-25 23:31:34.000000000 +0200
+++ djbfft-0.76/instcheck.c 2003-04-25 23:28:11.000000000 +0200
@@ -1,5 +1,6 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <errno.h>
#include "strerr.h"
#include "error.h"
#include "readwrite.h"
--- djbfft-0.76/strerr_sys.c.orig 2003-04-25 23:31:34.000000000 +0200
+++ djbfft-0.76/strerr_sys.c 2003-04-25 23:28:32.000000000 +0200
@@ -1,3 +1,4 @@
+#include <errno.h>
#include "error.h"
#include "strerr.h"
--- djbfft-0.76/substdi.c.orig 2003-04-25 23:31:34.000000000 +0200
+++ djbfft-0.76/substdi.c 2003-04-25 23:28:41.000000000 +0200
@@ -1,3 +1,4 @@
+#include <errno.h>
#include "substdio.h"
#include "byte.h"
#include "error.h"
--- djbfft-0.76/substdo.c.orig 2003-04-25 23:31:34.000000000 +0200
+++ djbfft-0.76/substdo.c 2003-04-25 23:28:47.000000000 +0200
@@ -1,3 +1,4 @@
+#include <errno.h>
#include "substdio.h"
#include "str.h"
#include "byte.h"
@@ -0,0 +1,38 @@
--- strerr.h.orig 1999-09-30 23:25:58.000000000 +0300
+++ strerr.h 2008-09-13 22:14:09.000000000 +0300
@@ -1,3 +1,5 @@
+#include <errno.h>
+
#ifndef STRERR_H
#define STRERR_H
--- substdio.h.orig 1999-09-30 23:25:58.000000000 +0300
+++ substdio.h 2008-09-13 22:13:41.000000000 +0300
@@ -1,3 +1,5 @@
+#include <errno.h>
+
#ifndef SUBSTDIO_H
#define SUBSTDIO_H
--- speed.c.orig 1999-09-30 23:25:58.000000000 +0300
+++ speed.c 2008-09-13 19:16:20.352525481 +0300
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
#include "fftr4.h"
#include "fftr8.h"
#include "fftc4.h"
--- accuracy2.c.orig 2008-10-10 20:51:06.000000000 +0100
+++ accuracy2.c 2008-10-10 20:51:55.000000000 +0100
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include "fftc4.h"
--- accuracy.c.orig 2008-10-10 21:03:30.000000000 +0100
+++ accuracy.c 2008-10-10 21:03:43.000000000 +0100
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include "fftc4.h"
@@ -0,0 +1,133 @@
--- djbfft-0.76/Makefile.orig 1999-09-30 22:25:58.000000000 +0200
+++ djbfft-0.76/Makefile 2004-01-17 17:21:37.236669242 +0100
@@ -2,6 +2,9 @@
SHELL=/bin/sh
+LIBPERMS=0644
+LIBDJBFFT=djbfft.a
+
default: it
4c0.c: \
@@ -569,8 +572,8 @@
./compile 8v5.c
accuracy: \
-load accuracy.o djbfft.a math.lib
- ./load accuracy djbfft.a `cat math.lib`
+load accuracy.o $(LIBDJBFFT) math.lib
+ ./load accuracy $(LIBDJBFFT) `cat math.lib`
accuracy.o: \
compile accuracy.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
@@ -578,8 +581,8 @@
./compile accuracy.c
accuracy2: \
-load accuracy2.o djbfft.a math.lib
- ./load accuracy2 djbfft.a `cat math.lib`
+load accuracy2.o $(LIBDJBFFT) math.lib
+ ./load accuracy2 $(LIBDJBFFT) `cat math.lib`
accuracy2.o: \
compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
@@ -649,7 +652,7 @@
) > compilebase
chmod 755 compilebase
-djbfft.a: \
+$(LIBDJBFFT): \
makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o 8u0.o 8mc.o 8c0.o 8c1.o \
8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o \
8v4.o 8v3.o 8v2.o 8v1.o 8v0.o 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o \
@@ -657,7 +660,7 @@
4c1.o 4c2.o 4c3.o 4c4.o 4c5.o 4d0.o 4d1.o 4d2.o 4d3.o 4d4.o 4d5.o \
4v5.o 4v4.o 4v3.o 4v2.o 4v1.o 4v0.o 4mr.o 4r0.o 4r1.o 4r2.o 4r3.o \
4r4.o 4r5.o 4sr.o fftfreq.o
- ./makelib djbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
+ ./makelib $(LIBDJBFFT) 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
8u0.o 8mc.o 8c0.o 8c1.o 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o \
8d2.o 8d3.o 8d4.o 8d5.o 8v5.o 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o \
8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o 8r5.o 8sr.o 4sc.o 4u5.o \
@@ -692,7 +695,7 @@
hier.o: \
compile hier.c auto_home.h
- ./compile hier.c
+ ./compile -DLIBDJBFFT=\"$(LIBDJBFFT)\" -DLIBPERMS=$(LIBPERMS) hier.c
install: \
load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
@@ -731,7 +734,9 @@
( cat warn-auto.sh; \
echo 'main="$$1"; shift'; \
echo 'rm -f "$$main"'; \
- echo 'ar cr "$$main" $${1+"$$@"}'; \
+ echo 'if [ "$${main##*.}" = "a" ]'; \
+ echo 'then'; \
+ echo ' ar cr "$$main" $${1+"$$@"}'; \
case "`cat systype`" in \
sunos-5.*) ;; \
unix_sv*) ;; \
@@ -740,8 +745,11 @@
dgux-*) ;; \
hp-ux-*) ;; \
sco*) ;; \
- *) echo 'ranlib "$$main"' ;; \
- esac \
+ *) echo ' ranlib "$$main"' ;; \
+ esac; \
+ echo 'else'; \
+ echo ' exec `head -1 conf-ld` -shared -o "$$main" $${1+"$$@"}'; \
+ echo 'fi'; \
) > makelib
chmod 755 makelib
@@ -758,15 +766,15 @@
./compile open_trunc.c
prog: \
-djbfft.a accuracy accuracy2 speed speed.out
+$(LIBDJBFFT) accuracy accuracy2 speed speed.out
setup: \
it install
./install
speed: \
-load speed.o djbfft.a math.lib
- ./load speed djbfft.a `cat math.lib`
+load speed.o $(LIBDJBFFT) math.lib
+ ./load speed $(LIBDJBFFT) `cat math.lib`
speed.o: \
compile speed.c fftr4.h real4.h fftr8.h real8.h fftc4.h complex4.h \
@@ -775,7 +783,7 @@
speed.out: \
speed
- ./speed > speed.out
+ LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" ./speed > speed.out
str.a: \
makelib byte_copy.o byte_cr.o str_len.o
--- djbfft-0.76/hier.c.orig 1999-09-30 22:25:58.000000000 +0200
+++ djbfft-0.76/hier.c 2004-01-17 16:39:21.312774411 +0100
@@ -2,12 +2,12 @@
void hier()
{
- h(auto_home,-1,-1,02755);
+ h(auto_home,-1,-1,0755);
- d(auto_home,"lib",-1,-1,02755);
- c(auto_home,"lib","djbfft.a",-1,-1,0644);
+ d(auto_home,"lib",-1,-1,0755);
+ c(auto_home,"lib",LIBDJBFFT,-1,-1,LIBPERMS);
- d(auto_home,"include",-1,-1,02755);
+ d(auto_home,"include",-1,-1,0755);
c(auto_home,"include","real4.h",-1,-1,0644);
c(auto_home,"include","real8.h",-1,-1,0644);
c(auto_home,"include","complex4.h",-1,-1,0644);
+65
View File
@@ -0,0 +1,65 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>djbfft</Name>
<Homepage>http://cr.yp.to/djbfft.html</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>public-domain</License>
<IsA>library</IsA>
<Summary>Fast float library</Summary>
<Description>An extremely fast library for floating-point convolution.</Description>
<Archive sha1sum="df9d258a75183c10592d937ee2d2befc01a8a0f6" type="targz">http://cr.yp.to/djbfft/djbfft-0.76.tar.gz</Archive>
<Patches>
<Patch level="1">gcc3.patch</Patch>
<Patch level="1">shared.patch</Patch>
<Patch>headers.patch</Patch>
</Patches>
</Source>
<Package>
<Name>djbfft</Name>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>djbfft-devel</Name>
<Summary>Development files for djbfft</Summary>
<RuntimeDependencies>
<Dependency release="current">djbfft</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-20</Date>
<Version>0.76</Version>
<Comment>Rebuild.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-01-22</Date>
<Version>0.76</Version>
<Comment>Rebuild</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-10-13</Date>
<Version>0.76</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>djbfft</Name>
<Summary xml:lang="tr">Hızlı küsürlü sayı kitaplığı</Summary>
<Description xml:lang="tr">djbfft çok hızlı küsürlü sayı bükülme kitaplığıdır.</Description>
</Source>
<Package>
<Name>djbfft-devel</Name>
<Summary xml:lang="tr">djbfft için geliştirme dosyaları</Summary>
</Package>
</PISI>
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import pisitools
WorkDir = "."
def install():
pisitools.dosed("inxi", "os-release", "pisilinux-release")
pisitools.dosed("inxi", "lackware-version SuSE-release", "lackware-version SuSE-release pisilinux-release")
pisitools.dobin("inxi")
pisitools.doman("inxi.1.gz")
pisitools.dodoc("inxi.changelog")
pisitools.dosym("/usr/bin/inxi", "/usr/share/kde4/apps/konversation/scripts/inxi")
@@ -0,0 +1,21 @@
diff -Nuar inxi-1.8.34.orig/inxi inxi-1.8.34/inxi
--- inxi-1.8.34.orig/inxi 2013-04-20 14:06:01.586242908 +0300
+++ inxi-1.8.34/inxi 2013-04-20 14:11:08.959251481 +0300
@@ -334,7 +334,7 @@
FILE_MEMINFO='/proc/meminfo'
FILE_MODULES='/proc/modules'
FILE_MOUNTS='/proc/mounts'
-FILE_OS_RELEASE='/etc/os-release'
+FILE_OS_RELEASE='/etc/pisilinux-release'
FILE_PARTITIONS='/proc/partitions'
FILE_SCSI='/proc/scsi/scsi'
FILE_XORG_LOG='/var/log/Xorg.0.log' # if not found, search and replace with actual location
@@ -512,7 +512,7 @@
DISTROS_DERIVED="antix-version aptosid-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release siduction-version sidux-version turbolinux-release zenwalk-version"
# debian_version excluded from DISTROS_PRIMARY so Debian can fall through to /etc/issue detection. Same goes for Ubuntu.
DISTROS_EXCLUDE_LIST="debian_version ubuntu_version"
-DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release"
+DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release pisilinux-release"
DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
# this is being used both by core distros and derived distros now, eg, solusos uses it for solusos id, while
# debian, solusos base, uses it as well, so we have to know which it is.
+110
View File
@@ -0,0 +1,110 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>inxi</Name>
<Homepage>http://code.google.com/p/inxi/</Homepage>
<Packager>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Packager>
<License>GPLv1</License>
<IsA>app:console</IsA>
<Summary>script to get system information</Summary>
<Description>script to get system information</Description>
<Archive sha1sum="e7f84c1a2030a5c27e4d1d87c7e2e7c54af09b2e" type="targz">http://inxi.googlecode.com/svn/tarballs/inxi_2.2.19.tar.gz</Archive>
<Patches>
<!-- <Patch level="1">distro-pisilinux.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>inxi</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/kde4/apps/konversation/scripts/inxi</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="11">
<Date>2015-07-23</Date>
<Version>2.2.19</Version>
<Comment>Version bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2015-01-26</Date>
<Version>2.2.17</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2014-06-17</Date>
<Version>2.1.28</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="8">
<Date>2014-05-03</Date>
<Version>2.1.27</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="7">
<Date>2013-12-16</Date>
<Version>1.9.17</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2013-10-0</Date>
<Version>1.9.15</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-07-08</Date>
<Version>1.9.12</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-04-27</Date>
<Version>1.8.45</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-04-20</Date>
<Version>1.8.34</Version>
<Comment>Distro list added PisiLinux</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-23</Date>
<Version>1.8.34</Version>
<Comment>Version bump</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-01-28</Date>
<Version>1.8.32</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
</History>
</PISI>
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>inxi</Name>
<Summary xml:lang="tr">script to get system information</Summary>
<Summary xml:lang="es">Script para la información del sistema</Summary>
<Summary xml:lang="nl">script voor het opvragen van systeem informatie</Summary>
<Description xml:lang="tr">script to get system information</Description>
<Description xml:lang="es">Inxi es un completo script que muestra la información del sistema</Description>
<Description xml:lang="nl">Script voor het opvragen van systeem informatie</Description>
</Source>
</PISI>