summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2012-12-09 17:15:06 +0000
committerryoon <ryoon@pkgsrc.org>2012-12-09 17:15:06 +0000
commit91b076bcf151bd5f3f192b1da6d09ed116876000 (patch)
treea9f302e1b13a9ecaf73ea75e39586b61037646c8
parentedf51762b944904b6140767dd63071b371ed5ef7 (diff)
downloadpkgsrc-91b076bcf151bd5f3f192b1da6d09ed116876000.tar.gz
Update to 0.5.0
Changelog: 25/05/2012: GPAC 0.5.0 - MPEG-DASH and Apple HLS support in GPAC Clients - MPEG-DASH segmenter for ISO files and MPEG-2 TS in MP4Box - MP42TS generator now supports HLS output - Support for MPEG-U and W3C widgets - UPnP and DLNA support in the player through Platinum libraries, interfaced in JavaScript - Better support for AVC and SVC muxing in MP4 - Support for OpenSVC decoder - Stereo and Multi-view renderer for auto-stereoscopic screens - iOS and Android support (but Symbian support has been dropped) - Camera input through "camera://default" URLs on Windows, OSX 32bit, Linux V4L v1 and Android - experimental audio filters - Better T-DMB support - experimental DVB-MPE and DSM-CC support - BIFS ExtendedCore2D profile support - more work on GUI - and many many fixes and improvements in players and MP4Box
-rw-r--r--multimedia/gpac/Makefile9
-rw-r--r--multimedia/gpac/PLIST77
-rw-r--r--multimedia/gpac/buildlink3.mk5
-rw-r--r--multimedia/gpac/distinfo15
-rw-r--r--multimedia/gpac/patches/patch-aa22
-rw-r--r--multimedia/gpac/patches/patch-ab12
-rw-r--r--multimedia/gpac/patches/patch-ac36
-rw-r--r--multimedia/gpac/patches/patch-ad131
-rw-r--r--multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h15
-rw-r--r--multimedia/gpac/patches/patch-modules_oss__audio_Makefile18
10 files changed, 95 insertions, 245 deletions
diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile
index cc707cf9533..11c0cc5f62b 100644
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.27 2012/11/03 01:58:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2012/12/09 17:15:06 ryoon Exp $
#
-DISTNAME= gpac-0.4.5
-PKGREVISION= 19
+DISTNAME= gpac-0.5.0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpac/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gpac.sourceforge.net/
+HOMEPAGE= http://gpac.wp.mines-telecom.fr/
COMMENT= Open source multimedia framework
LICENSE= gnu-lgpl-v2.1
MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/gpac
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake grep gsed
USE_LANGUAGES= c c++
# not really GNU configure, but close enough
GNU_CONFIGURE= yes
diff --git a/multimedia/gpac/PLIST b/multimedia/gpac/PLIST
index 7d707567b85..7893c9008b5 100644
--- a/multimedia/gpac/PLIST
+++ b/multimedia/gpac/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:08:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/12/09 17:15:06 ryoon Exp $
bin/MP4Box
bin/MP4Client
lib/gpac/gm_aac_in.so
lib/gpac/gm_ac3_in.so
+lib/gpac/gm_audio_filter.so
lib/gpac/gm_bifs_dec.so
lib/gpac/gm_ctx_load.so
lib/gpac/gm_dummy_in.so
@@ -13,21 +14,91 @@ lib/gpac/gm_ismacryp.so
lib/gpac/gm_isom_in.so
lib/gpac/gm_laser_dec.so
lib/gpac/gm_mp3_in.so
+lib/gpac/gm_mpd_in.so
lib/gpac/gm_mpegts_in.so
lib/gpac/gm_odf_dec.so
lib/gpac/gm_ogg_xiph.so
+lib/gpac/gm_osd.so
lib/gpac/gm_oss_audio.so
-lib/gpac/gm_raw_out.so
+lib/gpac/gm_pulseaudio.so
lib/gpac/gm_rtp_in.so
lib/gpac/gm_saf_in.so
lib/gpac/gm_soft_raster.so
lib/gpac/gm_svg_in.so
lib/gpac/gm_timedtext.so
+lib/gpac/gm_widgetman.so
lib/gpac/gm_x11_out.so
lib/gpac/gm_xvid_dec.so
-lib/libgpac-0.4.5.so
lib/libgpac.so
+lib/libgpac.so.2
+lib/libgpac.so.2.0.0
man/man1/gpac.1
man/man1/mp4box.1
man/man1/mp4client.1
share/gpac/gpac.mp4
+share/gpac/gui/extensions/widget_manager/applications-system.svg
+share/gpac/gui/extensions/widget_manager/init.js
+share/gpac/gui/gui.bt
+share/gpac/gui/gui.js
+share/gpac/gui/gwlib.js
+share/gpac/gui/icons/applications-internet.svg
+share/gpac/gui/icons/applications-multimedia.svg
+share/gpac/gui/icons/applications-system.svg
+share/gpac/gui/icons/audio-volume-high.svg
+share/gpac/gui/icons/audio-volume-low.svg
+share/gpac/gui/icons/audio-volume-medium.svg
+share/gpac/gui/icons/audio-volume-muted.svg
+share/gpac/gui/icons/audio-x-generic.svg
+share/gpac/gui/icons/battery-caution.svg
+share/gpac/gui/icons/camera-photo.svg
+share/gpac/gui/icons/camera-video.svg
+share/gpac/gui/icons/dialog-error.svg
+share/gpac/gui/icons/dialog-information.svg
+share/gpac/gui/icons/dialog-warning.svg
+share/gpac/gui/icons/document-new.svg
+share/gpac/gui/icons/document-print-preview.svg
+share/gpac/gui/icons/document-print.svg
+share/gpac/gui/icons/document-save-as.svg
+share/gpac/gui/icons/document-save.svg
+share/gpac/gui/icons/edit-find.svg
+share/gpac/gui/icons/emblem-symbolic-link.svg
+share/gpac/gui/icons/emblem-unreadable.svg
+share/gpac/gui/icons/face-surprise.svg
+share/gpac/gui/icons/folder-open.svg
+share/gpac/gui/icons/folder.svg
+share/gpac/gui/icons/go-bottom.svg
+share/gpac/gui/icons/go-down.svg
+share/gpac/gui/icons/go-first.svg
+share/gpac/gui/icons/go-home.svg
+share/gpac/gui/icons/go-jump.svg
+share/gpac/gui/icons/go-last.svg
+share/gpac/gui/icons/go-next.svg
+share/gpac/gui/icons/go-previous.svg
+share/gpac/gui/icons/go-top.svg
+share/gpac/gui/icons/go-up.svg
+share/gpac/gui/icons/image-missing.svg
+share/gpac/gui/icons/left_arrow.svg
+share/gpac/gui/icons/list-add.svg
+share/gpac/gui/icons/list-remove.svg
+share/gpac/gui/icons/media-eject.svg
+share/gpac/gui/icons/media-playback-pause.svg
+share/gpac/gui/icons/media-playback-start.svg
+share/gpac/gui/icons/media-playback-stop.svg
+share/gpac/gui/icons/media-record.svg
+share/gpac/gui/icons/media-seek-backward.svg
+share/gpac/gui/icons/media-seek-forward.svg
+share/gpac/gui/icons/media-skip-backward.svg
+share/gpac/gui/icons/media-skip-forward.svg
+share/gpac/gui/icons/preferences-desktop-remote-desktop.svg
+share/gpac/gui/icons/preferences-system-windows.svg
+share/gpac/gui/icons/process-stop.svg
+share/gpac/gui/icons/right_arrow.svg
+share/gpac/gui/icons/tennis_ball.svg
+share/gpac/gui/icons/tennis_black.svg
+share/gpac/gui/icons/tennis_racket.svg
+share/gpac/gui/icons/tennis_racket_color.svg
+share/gpac/gui/icons/user-trash.svg
+share/gpac/gui/icons/video-display.svg
+share/gpac/gui/icons/video-x-generic.svg
+share/gpac/gui/icons/view-fullscreen.svg
+share/gpac/gui/mpegu-core.js
diff --git a/multimedia/gpac/buildlink3.mk b/multimedia/gpac/buildlink3.mk
index b13c207410a..32be7e1db20 100644
--- a/multimedia/gpac/buildlink3.mk
+++ b/multimedia/gpac/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/12/09 17:15:06 ryoon Exp $
BUILDLINK_TREE+= gpac
.if !defined(GPAC_BUILDLINK3_MK)
GPAC_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gpac+= gpac>=0.4.5
+BUILDLINK_API_DEPENDS.gpac+= gpac>=0.5.0
+BUILDLINK_ABI_DEPENDS.gpac+= gpac>=0.5.0
BUILDLINK_PKGSRCDIR.gpac?= ../../multimedia/gpac
.endif # GPAC_BUILDLINK3_MK
diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo
index 5754d73fe16..2d87eee718e 100644
--- a/multimedia/gpac/distinfo
+++ b/multimedia/gpac/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/10/09 17:53:51 marino Exp $
+$NetBSD: distinfo,v 1.7 2012/12/09 17:15:06 ryoon Exp $
-SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
-RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
-Size (gpac-0.4.5.tar.gz) = 4269054 bytes
-SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
-SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
-SHA1 (patch-ac) = 6b4d87c366d27d997c81014d152535150ac48042
-SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed
-SHA1 (patch-extra_lib__include__ffmpeg__avio.h) = dff4609d59ec5da3788e2b613b73075eda0e7af0
-SHA1 (patch-modules_oss__audio_Makefile) = 523e9fdfa620de073db3b388d25d18906c8001db
+SHA1 (gpac-0.5.0.tar.gz) = 48ba16272bfa153abb281ff8ed31b5dddf60cf20
+RMD160 (gpac-0.5.0.tar.gz) = fc9cd2665a699dbe6d228e4e638baeae12b9e6af
+Size (gpac-0.5.0.tar.gz) = 7861057 bytes
+SHA1 (patch-modules_oss__audio_Makefile) = dd47cf086edfb8ea63b6c58b6d1548177be44786
diff --git a/multimedia/gpac/patches/patch-aa b/multimedia/gpac/patches/patch-aa
deleted file mode 100644
index 5ef0105f41a..00000000000
--- a/multimedia/gpac/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
-
---- modules/oss_audio/oss.c.orig 2008-04-18 11:57:49.000000000 -0400
-+++ modules/oss_audio/oss.c
-@@ -89,7 +89,7 @@ static GF_Err OSS_Setup(GF_AudioOutput*d
- static void OSS_Shutdown(GF_AudioOutput*dr)
- {
- OSSCTX();
-- ioctl(ctx->audio_dev,SNDCTL_DSP_RESET);
-+ ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
- close(ctx->audio_dev);
- if (ctx->wav_buf) free(ctx->wav_buf);
- ctx->wav_buf = NULL;
-@@ -104,7 +104,7 @@ static GF_Err OSS_ConfigureOutput(GF_Aud
-
- if (!ctx) return GF_BAD_PARAM;
- /* reset and reopen audio-device */
-- ioctl(ctx->audio_dev,SNDCTL_DSP_RESET);
-+ ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
- close(ctx->audio_dev);
- if (ctx->wav_buf) free(ctx->wav_buf);
- ctx->wav_buf = NULL;
diff --git a/multimedia/gpac/patches/patch-ab b/multimedia/gpac/patches/patch-ab
deleted file mode 100644
index 7ddda730962..00000000000
--- a/multimedia/gpac/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
-
---- modules/x11_out/x11_out.c.orig 2009-01-23 09:17:24.000000000 -0500
-+++ modules/x11_out/x11_out.c
-@@ -25,6 +25,7 @@
-
- #include "x11_out.h"
- #include <gpac/constants.h>
-+#include <sys/time.h>
-
-
- void X11_SetupWindow (GF_VideoOutput * vout);
diff --git a/multimedia/gpac/patches/patch-ac b/multimedia/gpac/patches/patch-ac
deleted file mode 100644
index 639904bc89a..00000000000
--- a/multimedia/gpac/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2012/10/09 17:53:51 marino Exp $
-
-GCC 4.6+ chokes on "--warn-common" which older versions of GCC left fall to
-the linker. The missing "," after "-Wl" is no longer acceptable.
-Rest is from original version of patch
-
---- configure.orig 2008-12-02 18:04:42.000000000 +0000
-+++ configure
-@@ -102,7 +102,7 @@ extralibs="-lm"
- bigendian="no"
- SHFLAGS=-shared
- need_inet_aton="no"
--LDFLAGS="$LDFLAGS -Wl --warn-common"
-+LDFLAGS="$LDFLAGS -Wl,--warn-common"
- CFLAGS=""
- CPPFLAGS=""
- GPAC_SH_FLAGS=-lpthread
-@@ -217,12 +217,16 @@ case "$cpu" in
- ;;
- x86_64|amd64)
- cpu="x86"
-- is_64="yes"
-+ if test "$linux" = "yes" ; then
-+ is_64="yes"
-+ fi
- canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
- cpu="x86_64"
-- libdir="lib64"
-+ if test "$linux" = "yes" ; then
-+ libdir="lib64"
-+ fi
- #that's a bit crude...
- PIC_CFLAGS="-fPIC -DPIC"
- want_pic="yes"
diff --git a/multimedia/gpac/patches/patch-ad b/multimedia/gpac/patches/patch-ad
deleted file mode 100644
index d977fddc4c8..00000000000
--- a/multimedia/gpac/patches/patch-ad
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2011/02/06 15:50:04 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/media_tools/img.c.orig 2008-12-01 17:39:36.000000000 +0000
-+++ src/media_tools/img.c
-@@ -388,7 +388,7 @@ typedef struct
-
- static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-- GFpng *ctx = (GFpng*)png_ptr->io_ptr;
-+ GFpng *ctx = (GFpng*)png_get_io_ptr(png_ptr);
-
- if (ctx->pos + length > ctx->size) {
- png_error(png_ptr, "Read Error");
-@@ -399,7 +399,11 @@ static void user_read_data(png_structp p
- }
- static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- {
-+#if (PNG_LIBPNG_VER < 10500)
- longjmp(png_ptr->jmpbuf, 1);
-+#else
-+ png_longjmp(png_ptr, 1);
-+#endif
- }
-
- GF_EXPORT
-@@ -409,7 +413,10 @@ GF_Err gf_img_png_dec(char *png, u32 png
- png_struct *png_ptr;
- png_info *info_ptr;
- png_byte **rows;
-- u32 i, stride, bpp;
-+ u32 i, stride;
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-
- if ((png_size<8) || png_sig_cmp(png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
-
-@@ -424,7 +431,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_IO_ERR;
- }
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_IO_ERR;
-@@ -435,30 +442,30 @@ GF_Err gf_img_png_dec(char *png, u32 png
- png_read_info(png_ptr, info_ptr);
-
- /*unpaletize*/
-- if (info_ptr->color_type==PNG_COLOR_TYPE_PALETTE) {
-+ if (png_get_color_type(png_ptr, info_ptr)==PNG_COLOR_TYPE_PALETTE) {
- png_set_expand(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- }
-- if (info_ptr->num_trans) {
-+ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-+ if (num_trans) {
- png_set_tRNS_to_alpha(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- }
-
-- bpp = info_ptr->pixel_depth / 8;
-- *width = info_ptr->width;
-- *height = info_ptr->height;
-+ *width = png_get_image_width(png_ptr, info_ptr);
-+ *height = png_get_image_height(png_ptr, info_ptr);
-
-- switch (info_ptr->pixel_depth) {
-- case 8:
-+ switch (png_get_color_type(png_ptr, info_ptr)) {
-+ case PNG_COLOR_TYPE_GRAY:
- *pixel_format = GF_PIXEL_GREYSCALE;
- break;
-- case 16:
-+ case PNG_COLOR_TYPE_GRAY_ALPHA:
- *pixel_format = GF_PIXEL_ALPHAGREY;
- break;
-- case 24:
-+ case PNG_COLOR_TYPE_RGB:
- *pixel_format = GF_PIXEL_RGB_24;
- break;
-- case 32:
-+ case PNG_COLOR_TYPE_RGB_ALPHA:
- *pixel_format = GF_PIXEL_RGBA;
- break;
- default:
-@@ -469,18 +476,18 @@ GF_Err gf_img_png_dec(char *png, u32 png
- }
-
- /*new cfg, reset*/
-- if (*dst_size != info_ptr->width * info_ptr->height * bpp) {
-- *dst_size = info_ptr->width * info_ptr->height * bpp;
-+ if (*dst_size != png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr)) {
-+ *dst_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr);
- png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_BUFFER_TOO_SMALL;
- }
-- *dst_size = info_ptr->width * info_ptr->height * bpp;
-+ *dst_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr);
-
- /*read*/
- stride = png_get_rowbytes(png_ptr, info_ptr);
-- rows = (png_bytepp) malloc(sizeof(png_bytep) * info_ptr->height);
-- for (i=0; i<info_ptr->height; i++) {
-+ rows = (png_bytepp) malloc(sizeof(png_bytep) * png_get_image_height(png_ptr, info_ptr));
-+ for (i=0; i<png_get_image_height(png_ptr, info_ptr); i++) {
- rows[i] = dst + i*stride;
- }
- png_read_image(png_ptr, rows);
-@@ -495,7 +502,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
-
- void my_png_write(png_structp png, png_bytep data, png_size_t size)
- {
-- GFpng *p = (GFpng *)png->io_ptr;
-+ GFpng *p = (GFpng *)png_get_io_ptr(png);
- memcpy(p->buffer+p->pos, data, sizeof(char)*size);
- p->pos += size;
- }
-@@ -551,7 +558,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
- /* Allocate/initialize the image information data. REQUIRED */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- return GF_IO_ERR;
- }
-
diff --git a/multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h b/multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h
deleted file mode 100644
index fe85186b0a5..00000000000
--- a/multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-extra_lib__include__ffmpeg__avio.h,v 1.1 2012/03/12 11:22:15 fhajny Exp $
-
-SunOS already has offset_t defined.
---- extra_lib/include/ffmpeg/avio.h.orig 2007-05-30 15:54:08.000000000 +0000
-+++ extra_lib/include/ffmpeg/avio.h
-@@ -23,7 +23,9 @@
-
- /* output byte stream handling */
-
-+#if !defined(__sun)
- typedef int64_t offset_t;
-+#endif
-
- /* unbuffered I/O */
-
diff --git a/multimedia/gpac/patches/patch-modules_oss__audio_Makefile b/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
index 39df76fb875..b245a26ed09 100644
--- a/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
+++ b/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
@@ -1,13 +1,13 @@
-$NetBSD: patch-modules_oss__audio_Makefile,v 1.1 2012/05/22 05:58:47 joerg Exp $
+$NetBSD: patch-modules_oss__audio_Makefile,v 1.2 2012/12/09 17:15:07 ryoon Exp $
---- modules/oss_audio/Makefile.orig 2012-05-20 20:42:59.000000000 +0000
+--- modules/oss_audio/Makefile.orig 2012-02-14 15:18:34.000000000 +0000
+++ modules/oss_audio/Makefile
-@@ -40,7 +40,7 @@ endif
+@@ -35,7 +35,7 @@ LIB=gm_oss_audio.$(DYN_LIB_SUFFIX)
all: $(LIB)
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS)
-+ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-
-
- %.o: %.c
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS)
++ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
+ ifeq ($(STATICBUILD),yes)
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_oss_audio-static.$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(OSS_LDFLAGS)
+ endif