From 24dbfe34774c0c54251210c3bc4f33f5f0065d63 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Fri, 19 Jul 2013 16:28:29 +0200 Subject: [PATCH] Changed assembly name to gstreamer-sharp --- Makefile.am | 6 +++--- configure.ac | 14 +++++++------- ...harp-1.0.pc.in => gstreamer-sharp-1.0.pc.in | 0 ...p.dll.config => gstreamer-sharp.dll.config} | 0 sources/Makefile.am | 2 +- sources/glue/Makefile.am | 16 ++++++++-------- sources/gst-sharp.snk | Bin 596 -> 0 bytes ...t-sharp-api.raw => gstreamer-sharp-api.raw} | 0 ...sharp.metadata => gstreamer-sharp.metadata} | 17 +++++++++++++++++ sources/gstreamer-sharp.snk | Bin 0 -> 596 bytes 10 files changed, 36 insertions(+), 19 deletions(-) rename gst-sharp-1.0.pc.in => gstreamer-sharp-1.0.pc.in (100%) rename out/{gst-sharp.dll.config => gstreamer-sharp.dll.config} (100%) delete mode 100644 sources/gst-sharp.snk rename sources/{gst-sharp-api.raw => gstreamer-sharp-api.raw} (100%) rename sources/{gst-sharp.metadata => gstreamer-sharp.metadata} (90%) create mode 100644 sources/gstreamer-sharp.snk diff --git a/Makefile.am b/Makefile.am index 6b47db2fab..8524bebdbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = sources sources/glue doc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gst-sharp-1.0.pc +pkgconfig_DATA = gstreamer-sharp-1.0.pc -EXTRA_DIST = gst-sharp-1.0.pc.in -DISTCLEANFILES = gst-sharp-1.0.pc +EXTRA_DIST = gstreamer-sharp-1.0.pc.in +DISTCLEANFILES = gstreamer-sharp-1.0.pc diff --git a/configure.ac b/configure.ac index ef9551eb49..c975fa95b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([gst-sharp], [1.0.6]) +AC_INIT([gstreamer-sharp], [1.0.6]) AC_CONFIG_SRCDIR([README]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -10,10 +10,10 @@ dnl Package settings ASSEMBLY_COMPANY="" ASSEMBLY_COPYRIGHT="2012 Andreia Gaita" ASSEMBLY_DESCRIPTION="Gst-1.0 bindings for Mono" -ASSEMBLY_NAME="gst-sharp" +ASSEMBLY_NAME="gstreamer-sharp" ASSEMBLY_NAMESPACE="Gst" -ASSEMBLY_PC="gst-sharp-1.0" -ASSEMBLY_SHORTNAME="gst" +ASSEMBLY_PC="gstreamer-sharp-1.0" +ASSEMBLY_SHORTNAME="gstreamer" ASSEMBLY_TITLE="Gst#" ASSEMBLY_VERSION="1.0.6" AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"]) @@ -132,8 +132,8 @@ AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") dnl Check for Gst PKG_CHECK_MODULES(GST, gstreamer-1.0) -gst_prefix=/usr -AC_SUBST(gst_prefix) +gstreamer_prefix=/usr +AC_SUBST(gstreamer_prefix) AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) @@ -144,7 +144,7 @@ AC_CONFIG_FILES([ sources/Makefile sources/glue/Makefile sources/AssemblyInfo.cs - gst-sharp-1.0.pc + gstreamer-sharp-1.0.pc doc/Makefile ]) AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h ]],[[]]) diff --git a/gst-sharp-1.0.pc.in b/gstreamer-sharp-1.0.pc.in similarity index 100% rename from gst-sharp-1.0.pc.in rename to gstreamer-sharp-1.0.pc.in diff --git a/out/gst-sharp.dll.config b/out/gstreamer-sharp.dll.config similarity index 100% rename from out/gst-sharp.dll.config rename to out/gstreamer-sharp.dll.config diff --git a/sources/Makefile.am b/sources/Makefile.am index bc3884b806..04fbede867 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -32,7 +32,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) generated-stamp: $(API) $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GTK_SHARP_CFLAGS) \ --outdir=generated \ - --glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstsharpglue-1.0.6.so \ + --glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.6.so \ --glue-includes=gst/gst.h \ --assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am index eb12645d94..446b86bdd0 100644 --- a/sources/glue/Makefile.am +++ b/sources/glue/Makefile.am @@ -1,17 +1,17 @@ -lib_LTLIBRARIES = libgstsharpglue-1.0.6.la -# TODO: Select all files except generated.c dynamically -libgstsharpglue_1_0_6_la_SOURCES = gobject.c +lib_LTLIBRARIES = libgstreamersharpglue-1.0.6.la -nodist_libgstsharpglue_1_0_6_la_SOURCES = generated.c +libgstreamersharpglue_1_0_6_la_SOURCES = gobject.c -libgstsharpglue_1_0_6_la_LDFLAGS = -module -avoid-version -no-undefined +nodist_libgstreamersharpglue_1_0_6_la_SOURCES = generated.c -libgstsharpglue_1_0_6_la_LIBADD = $(GST_LIBS) +libgstreamersharpglue_1_0_6_la_LDFLAGS = -module -avoid-version -no-undefined + +libgstreamersharpglue_1_0_6_la_LIBADD = $(GST_LIBS) INCLUDES = $(GST_CFLAGS) -I$(top_srcdir) -libgstsharpglue.dll: $(libgstsharpglue_1_0_6_la_OBJECTS) libgstsharpglue.rc libgstsharpglue.def - ./build-dll libgstsharpglue $(VERSION) +libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_6_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def + ./build-dll libgstreamersharpglue $(VERSION) CLEANFILES = lib*.a lib*.dll diff --git a/sources/gst-sharp.snk b/sources/gst-sharp.snk deleted file mode 100644 index 403c7ad206521d7f409887de8158d9bf62a4e783..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONaL0002dxhNd1FTKQ__9ERNzHXnejI$1I_Ua9y zVqztk!`+Y~JqmHXRO#+0R-VgihY!e%3F{AP%QYK!mDvGRhlIgetbuT=C#|vf~Y-C-YxE418S;`GBFv5C`vjvl(u{Bil!zbV?dzn`Yn1INgd@ zOjL-%_RD zi3ki>_uo3TbW8m-%04wAPx^Kix!jeOuAgb|NFExYP-Qg!0Pf39X>dG{ zZ=%5T$He4AT_>3{55Zqm2|1S00uxMJ*xWfVbdA38u>o6o!7p9G=>;KzFk50quz}=u z0+}WMfU>)S1Q;>;+2V^U?%F=n=%ZyNG&8-_>TnC5j(}$+_~kJ2T7==cZfdd%UB#9D zW*ljg1d_Z#xUS1+QF5i((ngucl;0exSx=M0NTZZv)lmcA$W>61v z+B{147_&Wr6(_FGkUBvQt>$vqETCNY9IR4XxfFcE21=kx*O!Y| + + MessageFunc diff --git a/sources/gstreamer-sharp.snk b/sources/gstreamer-sharp.snk new file mode 100644 index 0000000000000000000000000000000000000000..f1f07772bab947840fd90bdeef7789fba7440591 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONaL0000ZEvxd4K=V_JnqE=}pCb{R+I4<27FO8a z8)54F37@hu>-IXWAs}T_VKm64`*O_>P($|f@sMPZr1e(m^B|RY`FDUH-w^!j%)Y~V zt*zwUzsG%Bu5o-UHDXdVTr->2nbRQ=7u!D78B%`6Xb%$WDZOUjjQ^FI#aM9liN2UtoJ(acd-VS}|SKPuZ+RlEyQ%C2R81mSU0Q$&B@E zE;Bb3=Vuw$j+4AiE!Kya$d0(aZochSHzmT8p2okA> z$%MAQqKx)0cG_LCxIwq(S=*A^-MoYQF&GzM=yY66@&YMpRw@5k`h@FB_mps-G{2bF z)*78*&nb9m)RtzfjlDnS1^rl{y5!v<1l!hR($mWXZ(rcc^K0IEj{i=2w7&`0q)ymk zyMCb8iRFy8@OSpMOUS@44uqt-;K?+ra(gV^*iPnA(@Pl`UO^=gYHp6aV<4qP5DCEt i{mR(Y$3!^1F~g3kKZ;!oQzReRsw%aZM(sB-%KIEFSS39G literal 0 HcmV?d00001